Merge branch 'MDL-61019-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Jul 2018 11:25:06 +0000 (13:25 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Jul 2018 11:25:06 +0000 (13:25 +0200)
commit011c1a42918cd1ea88c60296b659a8f9c4af1c0c
treec8e610e1735f3f9c9abbaf465abd78c0031579af
parentbfeef10af0808322182f69fef661e4bb90ecd833
parent9004441b7b8153341df0ce56fd170565b2995631
Merge branch 'MDL-61019-master' of https://github.com/lucaboesch/moodle