Merge branch 'MDL-60654' of https://github.com/joaociocca/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Nov 2017 00:16:40 +0000 (01:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Nov 2017 00:16:40 +0000 (01:16 +0100)
commit8edbd642b40770b19bf6130888bed52ad59738f6
tree3dee634d4d5f45eb912087792725b331f54420c1
parent9d51d8e81fbbf36936e5a9334a9a14cb07145598
parent6bc8a2e11fd0b528cc788722aeb0414143f9bf1d
Merge branch 'MDL-60654' of https://github.com/joaociocca/moodle