Merge branch 'MDL-64609-master' of git://github.com/merrill-oakland/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Jan 2019 17:05:26 +0000 (18:05 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Jan 2019 17:05:26 +0000 (18:05 +0100)
commit57cab1436b21519318b1771917afc4ce3170ea34
treeeb55effbd02e28838fb39b7f8083765ba32bcdbf
parent324c4f0556963c4ddf6691a5c6f62a4ffbe31a31
parentd64e545a36756fb338d76e16bf83d22b7c7b992b
Merge branch 'MDL-64609-master' of git://github.com/merrill-oakland/moodle