Merge branch 'MDL-62200-master' of git://github.com/bmbrands/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 10 May 2018 16:04:08 +0000 (18:04 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 10 May 2018 16:04:08 +0000 (18:04 +0200)
commit74e82e468439d9d9aa121175aca6d7c32cee901c
tree7c4284b10888893572c9dfe9fe25e1f98c66032a
parent7b6c74431b05c7cd3b662f44e1e50facae81645b
parentbfe00e67a34814e07feb1ba5bc72f45fd22b7b4a
Merge branch 'MDL-62200-master' of git://github.com/bmbrands/moodle
theme/boost/scss/moodle/core.scss
theme/bootstrapbase/style/moodle.css