Merge branch 'MDL-64286_35' of https://github.com/timhunt/moodle into MOODLE_35_STABLE
commitc5dab021db35d834db4f8d66f5d22457e625defb
authorDamyon Wiese <damyon@moodle.com>
Mon, 3 Dec 2018 07:40:47 +0000 (3 15:40 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 3 Dec 2018 07:40:47 +0000 (3 15:40 +0800)
treea4bfc6d5636e4ca674490f83909cac2c5334a9a5
parenta08ecb70f0f66e9c4a549720adbe333c2c36f3ef
parent35e9c7202e9cb0f44d0f2439df5152c096c574db
Merge branch 'MDL-64286_35' of https://github.com/timhunt/moodle into MOODLE_35_STABLE