Merge branch 'MDL-53980-master-enfix' of git://github.com/mudrd8mz/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 2 May 2016 02:46:50 +0000 (10:46 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 2 May 2016 02:46:50 +0000 (10:46 +0800)
commitf74e3ace69ee1629fcb648c580947584fcd89549
tree04a7c3c872493d58748d5c3a389bde5efdeb06a1
parentb4dfe61bdb9827fa16462091702a2cbc2ef2cc7c
parentc1d44340a500d8991fc0ca0ec68d339227b53b23
Merge branch 'MDL-53980-master-enfix' of git://github.com/mudrd8mz/moodle
admin/tool/lp/lang/en/tool_lp.php
lang/en/competency.php
mod/wiki/lang/en/wiki.php