Merge branch 'MDL-40790-master' of git://github.com/mihailges/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 11 Dec 2017 08:55:27 +0000 (16:55 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 11 Dec 2017 08:55:27 +0000 (16:55 +0800)
commit807ba44cc651897f6036f01af83b0b982cc8b5ed
tree5d06682e8ac4903c5f36af8e97ccd0cd39700544
parent42cec8067385bc3064d903e9a7b008472ec262fd
parent473391b667d10c5e0883265f67a285763ab60f18
Merge branch 'MDL-40790-master' of git://github.com/mihailges/moodle

Conflicts:
theme/boost/scss/moodle/modules.scss
theme/boost/scss/moodle/modules.scss
theme/bootstrapbase/less/moodle/modules.less
theme/bootstrapbase/style/moodle.css