Merge remote-tracking branch 'refs/remotes/origin/2.1'
authorAlexander Ebert <ebert@woltlab.com>
Fri, 12 May 2017 14:11:16 +0000 (16:11 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 12 May 2017 14:11:16 +0000 (16:11 +0200)
commit4629a5462e7a4240a74f3271687dc0465e7140a8
treeedca3f2d9e23d847c147f99a952c2df6c8ac03e9
parent50c22dfc749af8913c18afa7cfdb01b3529eb953
parenta3d450bf3a58cf47f1889e3461fa7d227ae5743d
Merge remote-tracking branch 'refs/remotes/origin/2.1'

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