From: Alexander Ebert Date: Thu, 7 Apr 2016 16:58:05 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/next' into next X-Git-Tag: 3.0.0_Beta_1~1951 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=81bd6a3b3518663340adaaf4b3bcdc5aa38354a3;p=GitHub%2FWoltLab%2FWCF.git Merge remote-tracking branch 'origin/next' into next # Conflicts: # wcfsetup/install/files/acp/templates/languageServerAdd.tpl # wcfsetup/install/files/acp/templates/languageServerList.tpl --- 81bd6a3b3518663340adaaf4b3bcdc5aa38354a3