Merge branch 'wip-MDL-62574-master' of git://github.com/abgreeve/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 12 Jun 2018 03:57:01 +0000 (11:57 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 12 Jun 2018 03:57:01 +0000 (11:57 +0800)
commitd49527613417aa7ae0454d0db1d43685bc865885
treedfa38a8586e5d58754cfeb8d975a6c498506c0a1
parent7ab9d0aedfbf5a5d8a868621b16abb63888b328d
parent666aae9deb1e2b16381b4af5bd2a2bd84f522a05
Merge branch 'wip-MDL-62574-master' of git://github.com/abgreeve/moodle