Merge branch 'MDL-61355' of git://github.com/danmarsden/moodle
commit98b5b9d8a58d80fb9377df42e63fcc42baf61fd2
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Jul 2018 10:39:31 +0000 (17 12:39 +0200)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Jul 2018 00:46:46 +0000 (19 08:46 +0800)
tree1a95e2bb72dd1b56474592c234174119194b1d73
parent7485089c91c6b1b44bf768462bb94e5a8fe4f18d
parent7dcbe6a9833a6ab7a2be6f850a3adfa0fe8b9153
Merge branch 'MDL-61355' of git://github.com/danmarsden/moodle