Merge branch '5.3'
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 12 Nov 2020 08:15:26 +0000 (09:15 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Thu, 12 Nov 2020 08:15:26 +0000 (09:15 +0100)
commit0eeec6f977184cb5cfe06d79f6c912e1ecb354fe
tree43bcdfe71299c8fde418cd7e9ccfbd2f15623def
parent9d4eae937f0ca2501ec1b27dd0bf7527fe851b50
parentd5660872cb3a5dc25f690618bf2abdf4f58dd5e0
Merge branch '5.3'
21 files changed:
com.woltlab.wcf/package.xml
com.woltlab.wcf/templates/articleAdd.tpl
com.woltlab.wcf/templates/pageHeaderUser.tpl
com.woltlab.wcf/templates/register.tpl
com.woltlab.wcf/templates/settings.tpl
wcfsetup/install/files/acp/templates/articleAdd.tpl
wcfsetup/install/files/acp/templates/boxAdd.tpl
wcfsetup/install/files/acp/templates/dataImport.tpl
wcfsetup/install/files/acp/templates/labelAdd.tpl
wcfsetup/install/files/acp/templates/labelGroupList.tpl
wcfsetup/install/files/acp/templates/labelList.tpl
wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
wcfsetup/install/files/acp/templates/rebuildData.tpl
wcfsetup/install/files/acp/templates/sitemapList.tpl
wcfsetup/install/files/acp/templates/tagList.tpl
wcfsetup/install/files/acp/templates/templateList.tpl
wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
wcfsetup/install/files/acp/templates/userAdd.tpl
wcfsetup/install/files/acp/templates/userRankAdd.tpl
wcfsetup/install/files/lib/system/WCF.class.php
wcfsetup/install/lang/de.xml