Merge branch 'MDL-52936_master' of https://github.com/marxjohnson/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Mar 2016 02:05:53 +0000 (10:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Mar 2016 02:05:53 +0000 (10:05 +0800)
commitc25f0b4d277cf8ca9e246de82e06c67afd67a50c
treebcfae7449251861e9a00538cbd65858408e1780e
parent2b38214a161e8d1f943332025889d639a0fc130e
parent024b1eade034bbc3379ed7c79a812177747b89b2
Merge branch 'MDL-52936_master' of https://github.com/marxjohnson/moodle
theme/bootstrapbase/less/moodle/core.less
theme/bootstrapbase/style/moodle.css