Commit Graph

2 Commits

Author SHA1 Message Date
Damyon Wiese 13410584be Merge branch 'MDL-40939-master' of https://github.com/timgus/moodle
Conflicts:
	filter/tex/version.php
	lang/en/admin.php
2013-12-03 09:26:58 +08:00
Petr Škoda c169e58048 MDL-42243 fix filter settings regression and support standard settings.php 2013-10-12 13:38:34 +02:00