Merge branch 'MDL-59813-master' of git://github.com/farhan6318/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 2 Jan 2018 08:03:03 +0000 (09:03 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 2 Jan 2018 08:03:03 +0000 (09:03 +0100)
commit6ffb51e74c333465550fc50badec7d3490b91c5e
tree4731df4de09216aa08d19a3f8aa9a554bf6463ed
parentb5e7264543ce18d4bad74254d3ad78df5d3434ff
parentc0aca8f3c7f9d24a3834d21a6a0252d77126ea42
Merge branch 'MDL-59813-master' of git://github.com/farhan6318/moodle