Merge branch 'MDL-61824-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Apr 2018 23:02:45 +0000 (01:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Apr 2018 23:02:45 +0000 (01:02 +0200)
commita2ac42d40cd0f21438676fbcaaf2618ecf6d674b
tree96db629c3de37aaf4d45bc9c425f3c0d2e6bf8c3
parent815c44ce076ed407ec21dfda5b6ab0fbfd91240f
parenta539e5605caa9fcf3e0b34c8faae9d1a07112e7e
Merge branch 'MDL-61824-master' of https://github.com/sammarshallou/moodle