Merge branch 'MDL-59429-master' of git://github.com/mickhawkins/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 00:06:54 +0000 (02:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 00:06:54 +0000 (02:06 +0200)
commitf3611eabc81b062232df55cba3541ef40b6021c3
tree20f6b50d4a306c16c424d2c98b859b0956abded6
parent9153d6ea05e26ae9c8f62ec5eb2b9d98b6c43c6e
parent0be294c00509b255b614f3fb6d72d8a9dc06508f
Merge branch 'MDL-59429-master' of git://github.com/mickhawkins/moodle