Merge branch 'MDL-56724-master' of git://github.com/damyon/moodle
commit7a677348e47c8f6e023253aa073d8cc5e6b91def
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Nov 2016 01:17:10 +0000 (15 02:17 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Nov 2016 09:07:34 +0000 (15 09:07 +0000)
treea4da673af0155fab871bbe32c8acde7b7583e5d0
parent258980248904eaad9641614eded694162bf24b8e
parentbf5dcc8abb04a7657d4ff2eed21d5e71500f3e58
Merge branch 'MDL-56724-master' of git://github.com/damyon/moodle
theme/boost/scss/moodle/modules.scss
theme/bootstrapbase/style/moodle.css