Merge branch 'MDL-57171-master-2' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 12 Dec 2016 10:31:16 +0000 (10:31 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 12 Dec 2016 10:31:16 +0000 (10:31 +0000)
1  2 
theme/bootstrapbase/style/moodle.css

Simple merge