Merge branch 'MDL-62049_master' of git://github.com/markn86/moodle
commitc8619b28a336b6a21efc76d9f0d251484dd658dd
authorJun Pataleta <jun@moodle.com>
Mon, 23 Apr 2018 05:54:38 +0000 (23 13:54 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 23 Apr 2018 05:54:38 +0000 (23 13:54 +0800)
tree6c6b86f179594d04cb9f442fe48c241536313e17
parentdb711f5eca124d78e3738f23dd7af127e17ccd35
parent63d170647cfbeebf39b9b53f6f134e58e3da5b12
Merge branch 'MDL-62049_master' of git://github.com/markn86/moodle