Merge branch 'MDL-51234-M28' of git://github.com/lazydaisy/moodle into MOODLE_28_STABLE
Conflicts: theme/bootstrapbase/style/moodle.css
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
Please register or sign in to comment