Merge branch 'MDL-62931-master' of git://github.com/rezaies/moodle
commita7870910ea574a6fbb33242cc21e401a2c9df86a
authorJun Pataleta <jun@moodle.com>
Mon, 30 Jul 2018 08:34:57 +0000 (30 16:34 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 30 Jul 2018 08:34:57 +0000 (30 16:34 +0800)
treed82708298a80bfb7a925962ef0dc5b13308ce971
parenta5d3d98bf934efa07cd28bddd0d90f0ec321ca00
parent32338e7bdaf8072bee4d2656f9442b94009fb819
Merge branch 'MDL-62931-master' of git://github.com/rezaies/moodle