Merge branch 'MDL-59999-master' of git://github.com/mihailges/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 19 Dec 2017 02:49:36 +0000 (10:49 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 19 Dec 2017 02:49:36 +0000 (10:49 +0800)
commitb260dec8b7ece6b99f6ccc29ab01b453b4568c7e
tree3f1fccf915669e234db637cbaebaee59e087973e
parent3e882c418be52cc6eaf7f523afdb2becaf113939
parenta86b75608a475f793c108b93374dfcefd498c1db
Merge branch 'MDL-59999-master' of git://github.com/mihailges/moodle