Merge branch 'MDL-63692-master-fix' of git://github.com/junpataleta/moodle
commitbc7195fa02365235e69af80f52c0ab94248b02e2
authorJun Pataleta <jun@moodle.com>
Tue, 20 Nov 2018 06:48:08 +0000 (20 14:48 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 20 Nov 2018 06:48:08 +0000 (20 14:48 +0800)
tree455c56b14e49268cc80bc68762f3fb954a4f2986
parent60e265e76fe5c6edc3535ca643ef738a3f2ea111
parent918776482acd20b6b980f782c1c2f89157fe0fb6
Merge branch 'MDL-63692-master-fix' of git://github.com/junpataleta/moodle