Merge branch 'MDL-64314_master' of git://github.com/dmonllao/moodle
commit45dc542a4073018a9b8baa4f2f9f2e446ffea048
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 18 Feb 2019 13:50:59 +0000 (18 14:50 +0100)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 18 Feb 2019 13:50:59 +0000 (18 14:50 +0100)
tree3ccad3c4ef557555db3b61d1bd8fddd2e4d7569e
parent0a828b592d588aaa37e67afd4ba42ac0241637cc
parentb5b112f62cbb104af365a06024edc1544baf335a
Merge branch 'MDL-64314_master' of git://github.com/dmonllao/moodle