Merge branch 'MDL-60784' of git://github.com/stronk7/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 13 Nov 2017 02:37:37 +0000 (10:37 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 13 Nov 2017 02:37:37 +0000 (10:37 +0800)
commit3ac10fa82a5a5bdf76e6dc7812064dc875f92263
treeb744ea059f30af1f15cfe3bdf9a060c771485af6
parent0164f50e80fcb0a5f14115be0337a91f41df4c59
parent6499085f3609e9ebd29b9ab5e79efee1637ad1ba
Merge branch 'MDL-60784' of git://github.com/stronk7/moodle