Merge branch 'MDL-60300' of https://github.com/NeillM/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Oct 2017 23:39:55 +0000 (01:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Oct 2017 23:39:55 +0000 (01:39 +0200)
commit0a073e9d4277ab30a4e7575d2de161be4c27f4ae
tree194ab959667006f93088d1e8b095d44e10689231
parent7b90f69db3161dac2a8e02ee4f1519efe4ac534f
parent078484f2e240df8281ac018c3497bca12c84f1a6
Merge branch 'MDL-60300' of https://github.com/NeillM/moodle