Merge branch 'MDL-62558-master' of git://github.com/abgreeve/moodle
commitd6946bb0f9706184f7d8830862e39e5c376627c1
authorDavid Monllao <davidm@moodle.com>
Wed, 3 Oct 2018 09:17:06 +0000 (3 11:17 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 3 Oct 2018 09:17:06 +0000 (3 11:17 +0200)
tree4fe09d4b953f061949baa1531e6fbd96374e3008
parent7c137e7845a1987bb8561876c6a7e9cb09812614
parentedbdeb6315421770d0f7565c304a60697663db4a
Merge branch 'MDL-62558-master' of git://github.com/abgreeve/moodle