Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Fri, 14 Sep 2018 12:39:08 +0000 (14:39 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Fri, 14 Sep 2018 12:39:08 +0000 (14:39 +0200)
commit584481a7536f87807349c550fdaf0d2516b483ed
tree54619e66c8015aa226ea3537f4e4bc8ee6fd9df4
parent7bff27f20d3ce412f997b04a11921b1a6cb4db3f
parent9917442ad3b4da8f732d0da36446a7cd4f19f43e
Merge branch 'master' into next
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml