Merge branch 'MDL-56542-master-enfix' of git://github.com/mudrd8mz/moodle
commitf2263f7c060696c299769c6323e27c43d3a012f9
authorDan Poltawski <dan@moodle.com>
Mon, 31 Oct 2016 15:15:09 +0000 (31 15:15 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 31 Oct 2016 15:15:09 +0000 (31 15:15 +0000)
tree54d75618720d2969ce31a5a4d06ff44ca80894a0
parent5ad34c43f6c813a4d5199233c4c99830a1bbfaa8
parentdfe73442f7306325c733ce0df48abb56fb56710a
Merge branch 'MDL-56542-master-enfix' of git://github.com/mudrd8mz/moodle
admin/tool/usertours/lang/en/tool_usertours.php
enrol/self/lang/en/enrol_self.php
lang/en/admin.php
lang/en/role.php
theme/boost/lang/en/theme_boost.php