Merge branch 'wip-MDL-61328-master' of git://github.com/marinaglancy/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 27 Mar 2018 05:50:22 +0000 (13:50 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Mar 2018 16:16:09 +0000 (18:16 +0200)
commit99feb82ab55924e6fc06248994d5fbe4556a4b87
tree97edcfa870189ca3dc388e0715f8c704a8a5a304
parent4683e5ff113e2675a8275b5aeaabe5873ac1dfdb
parent1f0157e13718c6a4db473aa4165edeaea2e83270
Merge branch 'wip-MDL-61328-master' of git://github.com/marinaglancy/moodle