Merge branch 'MDL-61778-master' of git://github.com/mickhawkins/moodle
commit5870677fd41c4890d6c7c7445f09a8da5f0c158b
authorJun Pataleta <jun@moodle.com>
Tue, 5 Jun 2018 08:40:17 +0000 (5 16:40 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jun 2018 09:16:03 +0000 (6 11:16 +0200)
tree7aa32deeecb73b82e76e2de242b829e31a705b21
parentdce622fba91e86a76263b77e9d0d9a841770325a
parentd0f3b5f08301094f2c994508babf80f57ca78029
Merge branch 'MDL-61778-master' of git://github.com/mickhawkins/moodle