Merge branch 'MDL-56910-master' of git://github.com/danpoltawski/moodle
commit258980248904eaad9641614eded694162bf24b8e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Nov 2016 01:13:40 +0000 (15 02:13 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Nov 2016 09:07:33 +0000 (15 09:07 +0000)
tree5e78d686b1621d0f57bf6ec764ac455047153bb9
parent5a9a2c61b9f965816f8f3faf5166b9a702e34205
parentf6dabb3194188a6523c75a67e7306d32eff35579
Merge branch 'MDL-56910-master' of git://github.com/danpoltawski/moodle
lib/outputrenderers.php
theme/boost/scss/moodle/buttons.scss
theme/boost/scss/moodle/filemanager.scss
theme/bootstrapbase/style/moodle.css