Merge branch 'MDL-61615-master' of git://github.com/rezaies/moodle
commitf61c5f8a9506f78872ef24fa4b68b2734c2dff6f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Mar 2018 09:20:11 +0000 (20 10:20 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Mar 2018 09:20:11 +0000 (20 10:20 +0100)
tree667c6c2e929fc6786776008108dc5a73764dc5c8
parent2624bb10e2df2354e4da38a886a0e2629c7c63b9
parentae9f5a04b1fe978017c1018f0cb0debd3cd6345c
Merge branch 'MDL-61615-master' of git://github.com/rezaies/moodle