Merge branch 'refs/heads/pr/2062'
authorAlexander Ebert <ebert@woltlab.com>
Wed, 5 Oct 2016 14:17:40 +0000 (16:17 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 5 Oct 2016 14:17:40 +0000 (16:17 +0200)
commit1a02d9d52d47d7649eb08486879dcc154881b2dc
treeccb50fad0323e6c87b14d060683054ea5d7576d1
parent75cbe31a37ddc310267129f303a4e831dbd6e6e3
parentb66ca2b49a183c0c32669992e778e3bcbeca507f
Merge branch 'refs/heads/pr/2062'

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