Merge branch 'MDL-60086-master' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Sep 2017 07:56:23 +0000 (09:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Sep 2017 07:56:23 +0000 (09:56 +0200)
commitbf30e4dc86b3715e29a3c60838ee4e8a3f10ff5a
tree17e0b6f8c0bcf8ee02ab2dc82b0487e21d547ac3
parent63b384d02a968ec99fdd9919f8776a2c17b459a4
parent9f813ab5df4deebfcd5003243f45f17ea401fe2d
Merge branch 'MDL-60086-master' of https://github.com/snake/moodle