Merge branch 'MDL-60759_master' of git://github.com/dmonllao/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 12 Dec 2017 07:14:03 +0000 (20:14 +1300)
committerJun Pataleta <jun@moodle.com>
Tue, 12 Dec 2017 07:14:03 +0000 (20:14 +1300)
commit4ea790da9ba5d7fa976de2f3f58142ac608bc82c
tree0687ec9cb50147e5aab60045b9de81e1bbc9d322
parent29c4106e2f261846026c4ac940fd357bac1cb20e
parent895e005989841e8219b477365caa0abe511e5aef
Merge branch 'MDL-60759_master' of git://github.com/dmonllao/moodle