Merge branch 'MDL-56910-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Nov 2016 01:13:40 +0000 (02:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Nov 2016 01:13:40 +0000 (02:13 +0100)
commit852264ad23451b81e69aadf6287f767d9f04089c
treea007176b4667d300f22d7b102a552993cf703b17
parent3a14f060d1df4b370ba03771b29d2375a6b01c37
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