Merge branch 'MDL-60158-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Sep 2017 20:06:00 +0000 (22:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Sep 2017 20:06:00 +0000 (22:06 +0200)
commit3f96ff0505d58c3e805eb64ccffb9fdc3fd02997
tree864bb6fd3f9f062a126eb791444ed573a40dbe9d
parentc01beb0cdf3a14c82eb6c617ea94e39dd58d2579
parent39ad9cf33363b686758409fff9eb6f38843cad24
Merge branch 'MDL-60158-master' of git://github.com/andrewnicols/moodle