Merge branch 'MDL-63139-master' of git://github.com/rezaies/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 18 Sep 2018 14:36:55 +0000 (16:36 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 18 Sep 2018 14:36:55 +0000 (16:36 +0200)
commit11decdb19ce42c5b0640da1d3074ecb6d53947e0
tree469cd9203d0c98dfcc4b671addba4fabed6d0008
parent6302d4cf64a60c457a2584494a7f298432ff72ee
parent46b29219e3acb53308c348bb7fa53689e7e8c9a6
Merge branch 'MDL-63139-master' of git://github.com/rezaies/moodle