Merge branch 'MDL-53698_master' of https://github.com/StudiUM/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 26 Apr 2016 15:42:00 +0000 (16:42 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 26 Apr 2016 15:42:00 +0000 (16:42 +0100)
commit604d5d473049cd449299a6a99b14eaa523d9d980
treed778a8d928919912c8901dce26bec1bcec9b2739
parentffce90886977188a75e2a72ce0b48b255432324b
parent68f8ad4c952ef480574e59402eacb9e045c47382
Merge branch 'MDL-53698_master' of https://github.com/StudiUM/moodle
admin/tool/lp/templates/plan_page.mustache
admin/tool/lp/templates/template_statistics.mustache