Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sun, 8 Sep 2019 14:37:06 +0000 (16:37 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 8 Sep 2019 14:37:06 +0000 (16:37 +0200)
commitda2ca78d10dafee99e48714014407fc50053585f
treef02ec0afea86bb95d4806235e4a8f1c75db5d4a2
parenta032ebd1539cc058aa9a1b51ac973ffea9abd69a
parent01866eda864db848d53f453fbd77223ce48a5562
Merge branch 'master' into next
com.woltlab.wcf/templates/settings.tpl
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml