Merge branch 'MDL-51234-master' of git://github.com/lazydaisy/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 1 Sep 2015 10:33:40 +0000 (18:33 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 1 Sep 2015 10:33:40 +0000 (18:33 +0800)
commit85a930f628e6cc12a059bde4502b6c9adb5b2ac2
tree66896b4cfc297df05c0b2ff8d185f556d2b1cf88
parent1652309d02086fd26c13cb935d179e3b80d41814
parent37cbded0c362f08667f1dd022c01965ea9c3fc8a
Merge branch 'MDL-51234-master' of git://github.com/lazydaisy/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
theme/bootstrapbase/style/moodle.css