Merge branch 'MDL-54035_master-fix' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 26 Sep 2018 21:28:34 +0000 (23:28 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 26 Sep 2018 21:28:34 +0000 (23:28 +0200)
commitd6b71d79239479cd1341f697852346e86cff14b5
treecff9ba81dfe73bc38b7ac194dec0e9aadd120bc7
parent659d9fe94269732f7f056ba4087be1b4fb83f10f
parente8ce6ca3068a4db9285976c344f14f63a365cf92
Merge branch 'MDL-54035_master-fix' of git://github.com/dmonllao/moodle