Merge branch 'MDL-61520-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 18 Apr 2018 05:28:36 +0000 (13:28 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 18 Apr 2018 05:28:36 +0000 (13:28 +0800)
commit7c12fc2734065337b7c79d0081277785a7928aee
tree82672f1808852ffa86b4d39613a5a0402e72ef3a
parentffced67c6708f74d43238469568cd712694e8fc6
parentde81dc8763f024fc222ef48741ff28605b9098ca
Merge branch 'MDL-61520-master' of git://github.com/lameze/moodle