Merge branch 'MDL-61351_master' of git://github.com/markn86/moodle
commit7485089c91c6b1b44bf768462bb94e5a8fe4f18d
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Jul 2018 10:31:41 +0000 (17 12:31 +0200)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Jul 2018 00:46:45 +0000 (19 08:46 +0800)
tree314f702c25e2c9c379e542ff9078f3d79559bad3
parent523704d9ec406d2a0cbc51e7eafba131f7018f5d
parent0f1dffe6afa4949093b8b1a73da2522c17c58743
Merge branch 'MDL-61351_master' of git://github.com/markn86/moodle