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)
1  2 
analytics/classes/manager.php
analytics/classes/model.php
lang/en/moodle.php

Simple merge
Simple merge
Simple merge