Merge branch 'MDL-59934-master' of git://github.com/ryanwyllie/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Sep 2017 21:19:48 +0000 (23:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Sep 2017 21:19:48 +0000 (23:19 +0200)
commit6e49ef0d94aa5151ac88d8ab51b37eab4a70fb9c
tree33e2433624b5935b302ff735251752c2a860fa72
parent4d4c5992ee95394d52b2c6a0feeeab6f86fa3f96
parent02e091b1f3d335d696a726caf90e0bc52ae08895
Merge branch 'MDL-59934-master' of git://github.com/ryanwyllie/moodle
calendar/lib.php