Merge branch 'MDL-66360-master-fix' of git://github.com/andrewnicols/moodle
commitfb99cef5f1fc56ba0acebce9e35e12a2cb4db5e3
authorJun Pataleta <jun@moodle.com>
Tue, 12 Nov 2019 08:10:38 +0000 (12 16:10 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 12 Nov 2019 08:10:38 +0000 (12 16:10 +0800)
tree6db7498b35e219a86b30768b01a65e6221b5f7e3
parent237ddb313f627b4f167120b406d30973aa97b5a4
parent0e32b5ae4141b290a43e9e01bb86d4215db4383f
Merge branch 'MDL-66360-master-fix' of git://github.com/andrewnicols/moodle