Merge branch 'm28_MDL-48041' of https://github.com/totara/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 18 Nov 2014 13:10:57 +0000 (13:10 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 18 Nov 2014 13:10:57 +0000 (13:10 +0000)
commit8d3fba4ce47b20382d7231c24bae8288d839c4b8
tree044e1ddf32e73ac6a1b5d98fbdb3547e9e23df0f
parentde134194b934b40a1a3f25c542094252142e039b
parente19367db1388980bb3aab9bb23f67a149d1e3620
Merge branch 'm28_MDL-48041' of https://github.com/totara/moodle

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