Merge branch 'MDL-60090-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 11 Oct 2017 07:58:46 +0000 (15:58 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 11 Oct 2017 07:58:46 +0000 (15:58 +0800)
1  2 
calendar/lib.php
theme/boost/scss/moodle/calendar.scss
theme/bootstrapbase/less/moodle/calendar.less
theme/bootstrapbase/style/moodle.css

Simple merge
Simple merge
Simple merge