Merge branch 'm28_MDL-46127' of https://github.com/totara/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 08:55:03 +0000 (09:55 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 08:55:03 +0000 (09:55 +0100)
commitd62f99195aa06b4cc592944f24e3f937f784648a
tree66ff57f2309055c8282cc790bb323cf6d7425400
parent73a37dff730f58465515b590d6e6a64efb2c4a71
parent11edf09c6158fb5ebb64633e57bc57121d73d61d
Merge branch 'm28_MDL-46127' of https://github.com/totara/moodle

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