projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5c94e9 d82507d)
Merge remote-tracking branch 'origin/next' into next
authorAlexander Ebert <ebert@woltlab.com>
Thu, 7 Apr 2016 16:58:05 +0000 (18:58 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 7 Apr 2016 16:58:05 +0000 (18:58 +0200)
# Conflicts:
# wcfsetup/install/files/acp/templates/languageServerAdd.tpl
# wcfsetup/install/files/acp/templates/languageServerList.tpl


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)