Merge branch 'MDL-32232-master' of https://github.com/lucaboesch/moodle
commit3a0e92cd6ad6b5e3d3042299b6f43e640b96a2ac
authorDavid Monllao <davidm@moodle.com>
Tue, 3 Jul 2018 11:59:57 +0000 (3 13:59 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 3 Jul 2018 11:59:57 +0000 (3 13:59 +0200)
tree7ac07893a3e59398f6b73e1b271f907a1eccc3b3
parentdd808ec6b9e9335cf0cad8af892bbe1995392650
parent73e571aae13090757e37b3b0107d4ed65a7e0357
Merge branch 'MDL-32232-master' of https://github.com/lucaboesch/moodle