Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 20 Sep 2011 12:51:20 +0000 (14:51 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 20 Sep 2011 12:51:20 +0000 (14:51 +0200)
commit72e6ec201e38294f3016afffc96df0890acc0f98
tree56e72e883f1d80049259c7b6008c9aa217741ec2
parente89c399a8a6fafcaf881331abc3b314b7a034f84
parentc40b3e2256d8e9e6815143eeb79d80c955788fe2
Merge branch 'master' of github.com:WoltLab/WCF

Conflicts:
wcfsetup/install/files/acp/templates/acpSessionLog.tpl
wcfsetup/install/files/acp/templates/cronjobList.tpl
13 files changed:
wcfsetup/install/files/acp/templates/acpSessionLog.tpl
wcfsetup/install/files/acp/templates/cronjobAdd.tpl
wcfsetup/install/files/acp/templates/cronjobList.tpl
wcfsetup/install/files/acp/templates/packageStartInstall.tpl
wcfsetup/install/files/acp/templates/updateServerAdd.tpl
wcfsetup/install/files/acp/templates/updateServerList.tpl
wcfsetup/install/files/acp/templates/userAdd.tpl
wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
wcfsetup/install/files/acp/templates/userGroupAdd.tpl
wcfsetup/install/files/acp/templates/userGroupList.tpl
wcfsetup/install/files/acp/templates/userList.tpl
wcfsetup/install/files/acp/templates/userMail.tpl
wcfsetup/install/files/js/WCF.js