Merge branch 'MDL-62649-master' of git://github.com/mihailges/moodle
commite692de3e58c42f677c3e5f1b763b7f724a9adea8
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jun 2018 23:45:13 +0000 (12 01:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jun 2018 23:45:13 +0000 (12 01:45 +0200)
tree1c52499dfaa4fe9b096c1a9e189e6016b1ead7f1
parent3036620e0b2f43fe01197b74fa4df21a783c6a7a
parent89e78fd094ebf398cbffb751b4f43c7b2f5ef33b
Merge branch 'MDL-62649-master' of git://github.com/mihailges/moodle