Merge branch 'wip-MDL-45507_master' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 1 Jul 2014 21:21:29 +0000 (09:21 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 1 Jul 2014 21:21:29 +0000 (09:21 +1200)
commit4c92c676e310c30b3056167cf653fcad23d146c8
tree966c9ab4884a835cdba87de7eca7358d2a59594f
parent024d762da733237f63df402cd58de6efb64e9982
parent430b74c3d0847fc0f2428bc346f47b93ed12809c
Merge branch 'wip-MDL-45507_master' of git://github.com/lazydaisy/moodle
theme/bootstrapbase/renderers/core_renderer.php