Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorMarcel Werk <burntime@woltlab.com>
Wed, 18 Oct 2017 16:39:37 +0000 (18:39 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 18 Oct 2017 16:39:37 +0000 (18:39 +0200)
commit87a461b68b71b00fab81ec5114773a4fdd9529ed
treeb4c56f57b270c9af92baecd44a287488c0f9277d
parentc8c7ec65e4a4bc57fcea7b683b0b6317fd9ac416
parentfa60ae6e823418d764e7128661ac5c7549c19729
Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:
# wcfsetup/install/lang/de.xml
# wcfsetup/install/lang/en.xml
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml