Merge branch 'MDL-40790-master' of git://github.com/mihailges/moodle
Conflicts: theme/boost/scss/moodle/modules.scss
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
Please register or sign in to comment
Conflicts: theme/boost/scss/moodle/modules.scss