Merge branch 'MDL-62273-master' of https://github.com/sammarshallou/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 6 Jun 2018 09:12:48 +0000 (11:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jun 2018 09:16:41 +0000 (11:16 +0200)
commita7fb68f27f82b986d8a1457fb23c21f8016b6c66
tree92e5cacf682af35d885ae7db3e9b6779f01852c5
parent054900f5ed0c230a4e4488c995915e219966526d
parentbef86c669cccd9eef711b4a77ea5a739c6e825c0
Merge branch 'MDL-62273-master' of https://github.com/sammarshallou/moodle