Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Sun, 6 Jan 2019 11:50:54 +0000 (12:50 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Sun, 6 Jan 2019 11:50:54 +0000 (12:50 +0100)
commita357afb546b15f7cced9c7e1ce471aff7fcd61dd
tree9e3b18674425644b1621b4982048171d87d86dd2
parent02bc3f6162b2b5aaba01f75532c815f0aac8c4ba
parent255b418dfaa669cdaa06166e9cbdd8286f828b52
Merge branch 'master' into next
com.woltlab.wcf/templates/accountManagement.tpl
com.woltlab.wcf/templates/login.tpl
com.woltlab.wcf/templates/pageHeaderUser.tpl
com.woltlab.wcf/templates/pageMenuMobile.tpl
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml