Merge branch 'MDL-59840_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Sep 2017 10:24:54 +0000 (11:24 +0100)
committerDavid Monllao <davidm@moodle.com>
Thu, 7 Sep 2017 08:50:13 +0000 (10:50 +0200)
1  2 
admin/settings/analytics.php

Simple merge