Merge branch 'MDL-60576-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 2 Nov 2017 03:38:57 +0000 (11:38 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 2 Nov 2017 03:38:57 +0000 (11:38 +0800)
1  2 
theme/bootstrapbase/style/moodle.css

Simple merge