Merge branch 'wip-MDL-64729-master' of https://github.com/Beedell/moodle
commitde1f00fdbece3b9966e2023e54155a2f07b57451
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 21 Feb 2019 11:20:48 +0000 (21 12:20 +0100)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 21 Feb 2019 11:20:48 +0000 (21 12:20 +0100)
treeb69e7df9490c02014cc51d9771d9d758c780d127
parentdf4a17c7ed8c320f1369b9b8fdfd1af7de163e9c
parentaf00998f74ecfb835a09c815b6dcfeed688d1049
Merge branch 'wip-MDL-64729-master' of https://github.com/Beedell/moodle