Merge branch 'MDL-62361' of git://github.com/stronk7/moodle
commit99a080f12a502a4807e0b11bb91ce43a7402d7cf
authorDavid Monllao <davidm@moodle.com>
Wed, 9 May 2018 11:52:30 +0000 (9 13:52 +0200)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:17:25 +0000 (10 09:17 +0800)
tree3571b50570ff040dbdcff70d11317c687b0b9769
parent0f125a45f4bdb590b55886c5cf563338e5624ad9
parent12ed3e27165115bb7f842dbf017706e2b7d7c79f
Merge branch 'MDL-62361' of git://github.com/stronk7/moodle