Merge branch 'wip-MDL-61976-master' of git://github.com/marinaglancy/moodle
commit6fe7510ae0f7e13c4fe9c387d5103a21ae575e0a
authorDavid Monllao <davidm@moodle.com>
Wed, 9 May 2018 09:43:25 +0000 (9 11:43 +0200)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:15:59 +0000 (10 09:15 +0800)
treef7d9b81e8a3c4e45b2aa9a598dd3a6a8ffa7cf92
parent8a4b725f6d67d4c022041f16a7bd0098ec9862f8
parent7cc21cb7bdbb4b60d054924690c4de2cca7cd9e6
Merge branch 'wip-MDL-61976-master' of git://github.com/marinaglancy/moodle