Merge branch 'MDL-62836-master' of git://github.com/sarjona/moodle
commitc4e14e535e65d25be560f03277e1a4c117b7e45b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jul 2019 21:56:39 +0000 (15 23:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jul 2019 21:56:39 +0000 (15 23:56 +0200)
treed3a4e05a2b5d556df9dd355c72245122d43d33ff
parente9514b4df9e3af95222d49670a58cec90693d1b9
parentae1556ad935e93bb9e85a18b88e0fb5dea637441
Merge branch 'MDL-62836-master' of git://github.com/sarjona/moodle