Merge branch 'MDL-54595-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 18 May 2016 03:30:25 +0000 (11:30 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 18 May 2016 03:30:25 +0000 (11:30 +0800)
commit98c3f736bbdf04feb10ee32ec344ede1a69c4553
treed02129b8917f2784de6e7b4d1e1a3e8bde03905e
parent63c492ece0a4bd48000f6c149191c3f60dd07d64
parent2664105c87f178963371b1bdc3a792b06587eeb2
Merge branch 'MDL-54595-master' of git://github.com/junpataleta/moodle
admin/tool/lp/templates/manage_competency_frameworks_page.mustache
admin/tool/lp/templates/manage_templates_page.mustache
admin/tool/lp/templates/plans_page.mustache
admin/tool/lp/templates/user_evidence_list_page.mustache