Merge branch 'MDL-60925-master' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 4 Dec 2017 01:32:26 +0000 (14:32 +1300)
committerJun Pataleta <jun@moodle.com>
Mon, 4 Dec 2017 01:32:26 +0000 (14:32 +1300)
commitbea5a1620390a0650614fb10b60d00dca3444664
tree8cca334c306e7ef7d8a3f96b1147305bb2f5a576
parentc1cd2924ec742d280a1f38ccdd665e7860dc5a93
parentb3480499c679930584cfc69166cd130bc3187657
Merge branch 'MDL-60925-master' of git://github.com/damyon/moodle