Merge branch 'MDL-44538-master' of https://github.com/lucaboesch/moodle
commita1b2d95092f85d31d6a27a9891e7122e14214094
authorDavid Monllao <davidm@moodle.com>
Tue, 31 Jul 2018 09:18:39 +0000 (31 11:18 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 31 Jul 2018 09:18:39 +0000 (31 11:18 +0200)
tree8880040edde2a69c89f42559d793197e75528e01
parent77b6d458e544abaa1030c88289c71f0fb6e4afbe
parent41a7fec75fcfeb14c0ab0bbe52da560999c889c2
Merge branch 'MDL-44538-master' of https://github.com/lucaboesch/moodle
theme/bootstrapbase/less/moodle/core.less
theme/bootstrapbase/style/moodle.css