Conflict solved between ext-profile and ext-update
authorRoland Häder <roland@mxchange.org>
Wed, 28 Oct 2009 03:45:29 +0000 (03:45 +0000)
committerRoland Häder <roland@mxchange.org>
Wed, 28 Oct 2009 03:45:29 +0000 (03:45 +0000)
commit1fdb0ddad0b3b7934e097af349145321c2b696b7
tree4f5857fa5deca0d54057750254f69234ac06ca10
parent97cc48768dde69e5a98aab29b54ae7326422f9cb
Conflict solved between ext-profile and ext-update
.gitattributes
inc/extensions/ext-update.php [new file with mode: 0644]
inc/libs/security_functions.php
inc/modules/member/what-welcome.php
templates/de/html/ext/ext_update.tpl [new file with mode: 0644]
templates/de/html/member/member_profile_outdated.tpl [new file with mode: 0644]
templates/de/html/profile-update.tpl