Merge branch 'MDL-50990_master' of git://github.com/lazydaisy/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 18 Aug 2015 01:47:38 +0000 (09:47 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 18 Aug 2015 01:47:38 +0000 (09:47 +0800)
commitff5b060c371f1fd60f8b70a98af6a085a870209b
tree542c8bbcbe97dd2971053eee76525aa9edf7a94b
parent0568684bfde083aa7e1d37e95e3a9b1be8599f52
parent054a5658064888680fda00e83ba950c2da9232f8
Merge branch 'MDL-50990_master' of git://github.com/lazydaisy/moodle

Conflicts:
theme/base/style/blocks.css
theme/base/style/blocks.css