Merge branch 'MDL-62017-master' of https://github.com/lucaboesch/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 20 Jun 2018 11:40:39 +0000 (19:40 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 20 Jun 2018 11:40:39 +0000 (19:40 +0800)
commit2a969f3cd6483b11a90b424b1256f5678da1f31c
tree5925ceefa0dc9f2fd36ca5a7facb732fd4ae5f1e
parent62dc3fde0ae4ad79b1a3b7411b33a84ec72cd11a
parent936e9c82b2294bf5167724ffe1f4950f13cb345f
Merge branch 'MDL-62017-master' of https://github.com/lucaboesch/moodle