Merge branch 'MDL-51633_master' of git://github.com/lazydaisy/moodle
commit6a8f40c394509ba0b9f2fcf534b24a5f4b280c5e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Oct 2016 15:40:34 +0000 (10 17:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Oct 2016 15:40:34 +0000 (10 17:40 +0200)
tree982da5661a91ceb8426bc41dd18c7234f649e2dd
parent518ba4906d293ce6da57e1bceec9ff6f92ca92ad
parent42bbb05f44b4d89ee3b7d78a982c2d2c50f0c362
Merge branch 'MDL-51633_master' of git://github.com/lazydaisy/moodle
theme/bootstrapbase/style/moodle.css