Merge branch 'MDL-60058-master-4' of git://github.com/ryanwyllie/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 16 Oct 2017 04:28:59 +0000 (12:28 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 16 Oct 2017 04:28:59 +0000 (12:28 +0800)
commit6dc633fd93be0e71eb8a0446b2af80d649a96d7c
treeba7df2288b018e1daa44689822a7362846a42b3e
parent5be8c8daa6889dac474ac484ca4ff589081bb9f5
parent7ec6d873e19564ad084839f592596255aa6dcb0b
Merge branch 'MDL-60058-master-4' of git://github.com/ryanwyllie/moodle
calendar/templates/month_detailed.mustache
theme/bootstrapbase/style/moodle.css