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)
commit1b3f3d5761d01d1af398447d327f55754d45e3f1
tree8435451e1d12fb194d8771c5b84b74a0e027c68d
parent3f94d190608397047da3c3211cb6c0ef7decdecb
parenta7ed05e7203c17149b89561143aecf5fb141a4ea
Merge branch 'MDL-60090-master' of git://github.com/andrewnicols/moodle
calendar/lib.php
theme/boost/scss/moodle/calendar.scss
theme/bootstrapbase/less/moodle/calendar.less
theme/bootstrapbase/style/moodle.css