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)
1  2 
calendar/lib.php

Simple merge