Merge branch 'MDL-59950_master' of git://github.com/dmonllao/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 2 Nov 2017 06:39:32 +0000 (14:39 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 2 Nov 2017 06:39:32 +0000 (14:39 +0800)
commit5dbd051502b6017166a95d0d16afddbf69a9a1e8
tree51b4c2cd7de622d621dc0e66092fac7f73ffd152
parent41080050b0950ae7d8f465966c698417b8641bb7
parentef9f60a63516895720c63a7b5e6970b9ccb628a7
Merge branch 'MDL-59950_master' of git://github.com/dmonllao/moodle