projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28bf084 e6cc829)
Merge remote-tracking branch 'refs/remotes/origin/master' into next
authorAlexander Ebert <ebert@woltlab.com>
Thu, 4 May 2017 16:42:46 +0000 (18:42 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 4 May 2017 16:42:46 +0000 (18:42 +0200)
# Conflicts:
# wcfsetup/install/files/js/WoltLabSuite.Core.min.js


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)