1
0
mirror of https://github.com/moodle/moodle.git synced 2025-03-19 15:10:05 +01:00
Damyon Wiese 515fe565f6 Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle
Conflicts:
	theme/bootstrapbase/less/moodle/forms.less
	theme/bootstrapbase/style/moodle.css
	version.php
2014-04-08 13:30:41 +08:00
..