Merge branch 'MDL-59669-master-3' of git://github.com/ryanwyllie/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Aug 2017 00:15:18 +0000 (02:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Aug 2017 00:15:18 +0000 (02:15 +0200)
commitf0e6ff9a8e8301a0c2b034000ccf5a8d60f8d68f
tree2526bfd17411398e195b91c34292cca5c3456174
parentb76caa44d57c37fc3727aab85e6ef86aca1b33d1
parent69b160ed12d581d1de00ab5b6a0ae16c9abb5c1a
Merge branch 'MDL-59669-master-3' of git://github.com/ryanwyllie/moodle
calendar/tests/externallib_test.php
lang/en/calendar.php
lib/formslib.php