Merge branch 'MDL-59926-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Sep 2017 22:27:49 +0000 (00:27 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Sep 2017 22:27:49 +0000 (00:27 +0200)
commit2e6112dd3f718b667a0cac2b847fc567f867fdc1
treef0df30510ee82cb1fab5da4114703c514df74535
parent69cfd26e15fec816cb3e6116eaa7be1a2c9f1354
parente36eefaeea08c40acc6d3b99dc5c2515c8629d14
Merge branch 'MDL-59926-master' of https://github.com/sammarshallou/moodle