Merge branch 'MDL-59784-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Aug 2017 10:28:32 +0000 (12:28 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Aug 2017 10:28:32 +0000 (12:28 +0200)
commitfaa509dfb26499f4b069b864aee105de3ffb6515
tree197a98d926f4a01c97d30cf67e0d8ffebb2b9e6a
parent1bf96e2388c5e5c9974557b36409cc70658e2d10
parent3e0df465db84a21a3fbd8d8fecc2878a50886fcd
Merge branch 'MDL-59784-master' of git://github.com/andrewnicols/moodle