Merge branch 'MDL-44507_master' of https://github.com/SWiT/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 9 Apr 2014 03:52:33 +0000 (11:52 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 9 Apr 2014 03:52:33 +0000 (11:52 +0800)
commit9eeacad9b8d8f97b5e99ce12ca469248ba51d106
treed65486b089110a755ea52e883ba54dd5c6bb4d3d
parent1b9a1e812830648ed763906cc095cd5bda6b7f09
parent0a4fe80bff1f9d8adfeb24ccda7afc522bdb743c
Merge branch 'MDL-44507_master' of https://github.com/SWiT/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
files/renderer.php
theme/base/style/filemanager.css
theme/bootstrapbase/less/moodle/filemanager.less
theme/bootstrapbase/style/moodle.css