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)
commitf8de8cb314d35c8d06a0aaffafe9046a43e6a745
tree835a68f07e94685fb5b02ca0b1fb532fcd6d8e88
parent51483e4a4e36cb79fb3d1f2816ebcac2d829d789
parent2fa1f92a8213f050338034480d8a69b38224f36f
Merge branch 'MDL-59204_master_v2' of git://github.com/markn86/moodle
admin/tool/analytics/classes/output/models_list.php
lang/en/moodle.php
lib/classes/analytics/target/no_teaching.php