Merge branch 'MDL-59995_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 18 Sep 2017 06:39:46 +0000 (14:39 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 18 Sep 2017 06:39:46 +0000 (14:39 +0800)
commit58cd2bfd8268cbd01fb75076c7bb1fdf1d7b7b93
tree5d54149906eb69f30cd1ab8397796c5b1f1346f4
parentbf2742f2f22dd8c86e2f973aa1f992624ed0bef2
parent391663ce285434f46308c7e92efa260ec6ef310a
Merge branch 'MDL-59995_master' of git://github.com/markn86/moodle