Merge branch 'MDL-64956-master2' of git://github.com/peterRd/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 18 Apr 2019 03:09:49 +0000 (11:09 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 18 Apr 2019 03:09:49 +0000 (11:09 +0800)
commit9f23a65e0ce49aa1a0a9d7ce9d644632be8b6bfc
tree40e5b6eb21d8e0d01fe8b9eb08667d5a4a7b369a
parent862a9b1d605bd8155c73a48a17c41eb7bc16a8bc
parenta0c9b6afcc1e7e7c8d5bd6b7db1a7a6851e967b1
Merge branch 'MDL-64956-master2' of git://github.com/peterRd/moodle