Merge branch 'MDL-66770-master-2' of https://github.com/ryanwyllie/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 4 Nov 2019 04:56:34 +0000 (12:56 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 4 Nov 2019 11:21:41 +0000 (19:21 +0800)
commitb00b51aab62e9ccce316cf4f6c59dbedc65c738a
tree856e5a8a952bfdddc7083c1194ed119bea7e80ea
parentfd8c0214479551151a5991b3fe576c68dbc191d9
parent9cec5dcaae005cb2f44a6acda0c36ecffaacf3b6
Merge branch 'MDL-66770-master-2' of https://github.com/ryanwyllie/moodle