Merge branch 'MDL-60174-master' of https://github.com/sammarshallou/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 29 Nov 2017 04:18:21 +0000 (12:18 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 29 Nov 2017 04:18:21 +0000 (12:18 +0800)
commit1e1bc822945a6f7abf82076352e1b9f8597cdda5
tree4fd226fe16936045d72d5870fbd7f8611334c5a7
parent1577c5ea201c5510097d047c287a36407adbb880
parent34aeacadcc23a53b774318c94408a8c3489d29f9
Merge branch 'MDL-60174-master' of https://github.com/sammarshallou/moodle