Merge branch 'MDL-37810-master-fix' of https://github.com/snake/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 22 Sep 2017 02:54:40 +0000 (10:54 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 22 Sep 2017 02:54:40 +0000 (10:54 +0800)
commitd38bb774eff93cd52dfbcad611e0ebd252275421
tree344553d65a1e2373ecceb1222bf79f4533740e4d
parent07cadbd794387b5d898172f64532241c987031d8
parentb7e9f1cc42d982cae9377c1e8b63495de5da650d
Merge branch 'MDL-37810-master-fix' of https://github.com/snake/moodle