Merge branch 'MDL-62237-master' of https://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Aug 2018 12:22:21 +0000 (14:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Aug 2018 12:22:21 +0000 (14:22 +0200)
commit90bdc5be4bd99d93704b4b2ae6f187224ef958f7
treec387cdd456064a32fc9d064eb8223e995bf6dcfb
parent75f23dc80fdb0f2ca6a58f2f84ab9b5040c78023
parentce3c772677111a2aabf0905261b526e2401ea55a
Merge branch 'MDL-62237-master' of https://github.com/lucaboesch/moodle