Merge branch 'MDL-59973-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 26 Oct 2017 07:47:22 +0000 (09:47 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 26 Oct 2017 07:47:22 +0000 (09:47 +0200)
1  2 
calendar/classes/local/event/forms/create.php
lang/en/admin.php

Simple merge