Merge branch 'MDL-61234-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 00:37:44 +0000 (01:37 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 00:37:44 +0000 (01:37 +0100)
commitdf4e047944267412e707eafdbdb071bdd88dd946
tree3b4dcef1e377e86a42d94d56e7d245b17db0bee0
parenta9a67db2c96fd8d7623b7a2a376c6e5619a34487
parent64c9b4046c6be6654bdd3ee438237e1318c95839
Merge branch 'MDL-61234-master' of git://github.com/andrewnicols/moodle