Merge branch 'MDL-62532-master' of git://github.com/rezaies/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 30 May 2018 08:20:02 +0000 (10:20 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 30 May 2018 08:20:02 +0000 (10:20 +0200)
commit8cb28219287a66d064f116ed5130ee0ed967525b
treef03d2b14c0b42e7ee4cec54cc31768623f62bef2
parent5a38bc90a8eaf134d25fd56be1aa4845d2bae9a0
parent3722c7d697d1ac4e9fb6b03092c2058052e6e645
Merge branch 'MDL-62532-master' of git://github.com/rezaies/moodle