Merge branch 'MDL-60760_master' of git://github.com/dmonllao/moodle
authorJake Dallimore <jake@moodle.com>
Fri, 10 Nov 2017 01:31:17 +0000 (09:31 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 10 Nov 2017 01:32:17 +0000 (09:32 +0800)
commitf5b63fc8294c22a8a70516b82ecaa98d8f06031b
tree9d858145fbd7980e0fba77e75c20e2ea4cdbbe31
parent4bcb0a9a1d6218317942fa8f216ef66f512c31d9
parent5da020169e5d0f4f30d2eb3dafbe55e18345e517
Merge branch 'MDL-60760_master' of git://github.com/dmonllao/moodle
admin/tool/analytics/lang/en/tool_analytics.php