Merge branch 'MDL-59987_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Oct 2017 04:00:51 +0000 (12:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Oct 2017 04:00:51 +0000 (12:00 +0800)
commit0b53be90561b4267f71db70046ab89029ea8c6fc
treeeca05931ecad79998b90264878c6fe20cff60151
parentae8353a0ba98d4bd818deed75017c80229c9642d
parent68f4be708532ef354228ef93df0f6de678c41e0b
Merge branch 'MDL-59987_master' of git://github.com/dmonllao/moodle
analytics/classes/manager.php
analytics/classes/model.php
lang/en/moodle.php