Merge branch 'MDL-41229-master' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 6 Oct 2013 23:50:29 +0000 (12:50 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 6 Oct 2013 23:50:29 +0000 (12:50 +1300)
commitd6cb394f2c749b3ed2f961550885f556f1ecef94
tree484871ad2dcc8f23765105f83e482799ea215f8f
parenteb665c34ef867b7c2dd9774f93f2ea25f7989d38
parentf6a4357e19f2186a44cdeda8ee96697fa5e7290e
Merge branch 'MDL-41229-master' of git://github.com/mouneyrac/moodle

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