Merge branch 'MDL-60346-master' of https://github.com/sammarshallou/moodle
commit1fee16f4f972e0783cdf4d7c7ba0fc59349517a4
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Oct 2017 23:03:06 +0000 (11 01:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Oct 2017 23:03:06 +0000 (11 01:03 +0200)
tree13cf5f876b57c98dff978c5352314d415f1c01e9
parent559d5c38945bce9018a773d4fbd35950a5496625
parent558b6306f4243748f59ace054b08d056fb784a8a
Merge branch 'MDL-60346-master' of https://github.com/sammarshallou/moodle