Merge branch 'MDL-56553-master-2' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 1 Dec 2016 06:31:45 +0000 (14:31 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 1 Dec 2016 06:31:45 +0000 (14:31 +0800)
commit8f5de6f268dab8dbdd765dca9251d6b181e347b4
tree63dfacf0e05755c04e6724b3e3d80d85d57ab619
parent1f16e4e68e454067ea2931a27460dfa7a5c94666
parent10df630ee8ca32fb1dfbea6d24d7ad5018f31698
Merge branch 'MDL-56553-master-2' of git://github.com/ryanwyllie/moodle
admin/tool/usertours/db/upgrade.php
admin/tool/usertours/lang/en/tool_usertours.php
admin/tool/usertours/version.php