Merge branch 'MDL-60449-master-enfix' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 19 Oct 2017 20:20:01 +0000 (22:20 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 19 Oct 2017 20:20:01 +0000 (22:20 +0200)
commitecb4a05cc2a23789356a608395855a486ddad7d8
tree96e736623e2d35d6194b16d22b966296f75ad051
parent3c0805b7c069c2de745a0f75dde8ec94a6e7f53b
parent2e86fdb0a2559397b90e5cdc6152377bf605f126
Merge branch 'MDL-60449-master-enfix' of git://github.com/mudrd8mz/moodle
admin/tool/analytics/lang/en/tool_analytics.php
lang/en/admin.php
lang/en/deprecated.txt
lang/en/hub.php
lang/en/moodle.php