Merge branch 'MDL-64314-master-upgrade-fix' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Feb 2019 15:49:50 +0000 (16:49 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Feb 2019 15:49:50 +0000 (16:49 +0100)
commitb7b914fbdc508b6ff939e1987fdaf959da891462
tree3aa4850fa6ce280d4e6cfe3f1f2cc7fd687ed717
parent33f070f1f698f9f743472f089e1f70c17e2edc0f
parent6d6a83e91d132386c6c203f44f282dc35268a0f0
Merge branch 'MDL-64314-master-upgrade-fix' of git://github.com/abgreeve/moodle