Merge branch 'm28_MDL-47632' of https://github.com/totara/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 23 Oct 2014 22:19:43 +0000 (11:19 +1300)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:21 +0000 (11:48 +0200)
1  2 
theme/bootstrapbase/style/moodle.css

Simple merge