Merge branch 'MDL-62048_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 20 Apr 2018 03:53:37 +0000 (11:53 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 20 Apr 2018 03:53:37 +0000 (11:53 +0800)
commitd816a900cb21df0b38beb417a112d4268fbb159e
tree981bb9043fd7db80498ed476c9a0487e13e5a99a
parent9fe8d2e33512d9d42d53cd5762753d14dc1aa48e
parentf611c727f3e29813e4b654902495f8aaae54217f
Merge branch 'MDL-62048_master' of git://github.com/markn86/moodle