Merge branch 'MDL-56652-master' of git://github.com/lameze/moodle
commitf41218d9fd2ee0fef84edf09057ec9ef1e41b6fa
authorDan Poltawski <dan@moodle.com>
Thu, 10 Nov 2016 14:37:00 +0000 (10 14:37 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 10 Nov 2016 14:37:00 +0000 (10 14:37 +0000)
tree0380d672ba7b308bc4bb3b24e8e5abd92c37b28a
parentc220e6d8c74f4e917cf67a2e79a713c016b79da9
parent2e1c739a28befeaf54ed7f5a95abbd1ad40e963a
Merge branch 'MDL-56652-master' of git://github.com/lameze/moodle
theme/bootstrapbase/style/moodle.css