Merge branch 'MDL-59204_master_v2' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 22 Aug 2017 04:46:23 +0000 (12:46 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 22 Aug 2017 04:46:23 +0000 (12:46 +0800)
1  2 
admin/tool/analytics/classes/output/models_list.php
lang/en/moodle.php
lib/classes/analytics/target/no_teaching.php