Eloy Lafuente (stronk7) 336314812f Merge branch 'MDL-48328_M29' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2015-02-03 11:42:41 +01:00
..