Eloy Lafuente (stronk7) b8475d375c Merge branch 'wip-MDL-46470-master' of git://github.com/marinaglancy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-08-13 00:24:51 +02:00
..