Merge branch 'MDL-62201-master' of git://github.com/bmbrands/moodle
commit3b1d98ba734e3b9723f64c817c35e97c84b11c63
authorJun Pataleta <jun@moodle.com>
Mon, 30 Apr 2018 13:54:35 +0000 (30 21:54 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 30 Apr 2018 13:54:35 +0000 (30 21:54 +0800)
tree48af1b70ef0fa87608b755b6119fcb4f83d6cdc3
parent732ebbe0fea8b61f2bf41b7be945ff1ac8cf1363
parent3f86772ae22787734419c62fe9dbcfd69fb3eb44
Merge branch 'MDL-62201-master' of git://github.com/bmbrands/moodle