Resolved conflicts
authorMarcel Werk <burntime@woltlab.com>
Fri, 1 Jul 2016 15:08:11 +0000 (17:08 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 1 Jul 2016 15:08:11 +0000 (17:08 +0200)
commit7ac7dc245bc283b6b0fa113f9980032d21efc413
treeebd76563bbc558ad42d8802326372da6fbecf678
parent0a6e48dabb208786c179ff5d4dcaeb1cb93bd14f
Resolved conflicts
com.woltlab.wcf/templates/user.tpl
wcfsetup/install/files/lib/page/UserPage.class.php
wcfsetup/install/files/lib/system/menu/user/profile/UserProfileMenu.class.php