Merge branch '3.0'
authorTim Düsterhus <duesterhus@woltlab.com>
Sun, 6 Jan 2019 11:50:31 +0000 (12:50 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Sun, 6 Jan 2019 11:50:31 +0000 (12:50 +0100)
commit255b418dfaa669cdaa06166e9cbdd8286f828b52
treeee75cd19b4504138422d06aebf620f9692451703
parentfbca39701272f37b605c455a1a10b50f8626895b
parentfdd46df8e816e0cd9330bed883dbfa5787ab2e79
Merge branch '3.0'
com.woltlab.wcf/templates/accountManagement.tpl
com.woltlab.wcf/templates/login.tpl
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml