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