Merge branch 'MDL-59786_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Sep 2017 10:52:14 +0000 (11:52 +0100)
committerDavid Monllao <davidm@moodle.com>
Thu, 7 Sep 2017 08:50:15 +0000 (10:50 +0200)
1  2 
lang/en/analytics.php

Simple merge