projects / GitHub / WoltLab / WCF.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c30f5eb 24da3e1)
Merge remote-tracking branch 'refs/remotes/origin/master' into next
authorAlexander Ebert <ebert@woltlab.com>
Thu, 22 Jun 2017 16:32:27 +0000 (18:32 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 22 Jun 2017 16:32:27 +0000 (18:32 +0200)
commit678e1c45efd34e9a9cb9b125f92667d7bbe64e6e
tree9037d59f2e0411e2277aee5bb961b64bc105172etree | snapshot (tar.gz zip)
parentc30f5eb505de143798537e8ca76cf2a5bb340b02commit | diff
parent24da3e15b3dca0c45b68811051078112846a9646commit | diff
Merge remote-tracking branch 'refs/remotes/origin/master' into next

# Conflicts:
# com.woltlab.wcf/package.xml
# wcfsetup/install/files/js/3rdParty/redactor2/plugins/combined.min.js
# wcfsetup/install/files/js/3rdParty/redactor2/redactor.min.js
# wcfsetup/install/files/lib/system/WCF.class.php
wcfsetup/install/files/lib/acp/form/UserMailForm.class.php diff1 | diff2 | blob | history
wcfsetup/install/files/lib/system/session/SessionHandler.class.php diff1 | diff2 | blob | history
WoltLab Suite Core (previously WoltLab Community Framework)