Merge branch 'MDL-41215-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Oct 2013 19:48:43 +0000 (08:48 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Oct 2013 19:48:43 +0000 (08:48 +1300)
commit6455dec02db8c0b45a762ed7905a26abb2cc6f3e
tree0884c61a9331b08703dbe0454eaab0118f47ae3d
parent81a939be02a787094f04c3c04babe1bcdd2b9b09
parent09bfdcb09138d42cdfc9e6e77a07b16b7824f4ea
Merge branch 'MDL-41215-master' of git://github.com/andrewnicols/moodle

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