Merge branch 'MDL-62448-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 May 2018 15:29:06 +0000 (17:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 May 2018 15:29:06 +0000 (17:29 +0200)
commitcd0f1aa403d81b5e72272aaf486842528aff4f05
treeedc332094c5d7820ecfabfc7aa0ca3a8d9b28273
parent12ef4a1219ab3ec9d706dca533933914f631d419
parent9d594541b668d0fe8276025018186c858d505153
Merge branch 'MDL-62448-master' of git://github.com/sarjona/moodle