Merge branch 'MDL-59910-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 28 Aug 2017 23:06:46 +0000 (01:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 28 Aug 2017 23:06:46 +0000 (01:06 +0200)
commit685e99cabe412a1e358e36ed943bbe2132745fb0
treeef42cf957a95e91b8057bcbd7a61f2efc17af6a3
parent1fb5f3cf4a99aeb8112d1d17a6c3b9de14137b14
parent59641f4eb9c69fd5fbe365b08607bffbacfe8e06
Merge branch 'MDL-59910-master' of git://github.com/lameze/moodle