Merge branch 'mdl59843-master' of https://github.com/tlock/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 19 Oct 2017 00:22:01 +0000 (13:22 +1300)
committerJun Pataleta <jun@moodle.com>
Thu, 19 Oct 2017 00:22:01 +0000 (13:22 +1300)
1  2 
theme/bootstrapbase/style/moodle.css

Simple merge