Merge branch '3.0'
authorAlexander Ebert <ebert@woltlab.com>
Fri, 18 May 2018 14:08:29 +0000 (16:08 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 18 May 2018 14:08:29 +0000 (16:08 +0200)
commitfe4c3ce5c78dc2df87f89354028a557aaedc9200
tree3ad70420ce1d42cfe444b7e71bc1df6c096979c2
parentb7f936eb20091303faaebf4c128f0ff9aeb5567f
parent0f690811256f935326683ba73c443b5dcc086f6a
Merge branch '3.0'
wcfsetup/install/files/acp/templates/userList.tpl
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml