projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3782530 4ef2bf8)
Merge remote-tracking branch 'origin/next' into next
authorAlexander Ebert <ebert@woltlab.com>
Thu, 28 Jul 2016 09:34:59 +0000 (11:34 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 28 Jul 2016 09:34:59 +0000 (11:34 +0200)
# Conflicts:
# wcfsetup/install/files/acp/templates/pageMenuMobile.tpl


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)