Merge branch 'MDL-56910-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 15 Nov 2016 08:34:07 +0000 (16:34 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Nov 2016 09:07:42 +0000 (09:07 +0000)
commit396edc0a5e99d2f403f123a843a4e25826f12aa8
tree6a4e853a4fb992d0b46056fd1c66a20361715f97
parent998432c2c921f7306f8b7358ed12d71efaa2a034
parentd82aa0a2d9dac1a3cf7b95c05a3ff6e465c2c507
Merge branch 'MDL-56910-master' of git://github.com/danpoltawski/moodle
theme/boost/scss/moodle/filemanager.scss
theme/bootstrapbase/style/moodle.css