Merge branch 'MDL-56190-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 10 Nov 2016 13:43:35 +0000 (13:43 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 10 Nov 2016 13:43:35 +0000 (13:43 +0000)
1  2 
theme/boost/scss/moodle/forms.scss
theme/bootstrapbase/style/moodle.css

Simple merge
Simple merge