projects / GitHub / WoltLab / WCF.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3b932df 6f40b52)
Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0
authorAlexander Ebert <ebert@woltlab.com>
Mon, 12 Feb 2018 13:14:24 +0000 (14:14 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 12 Feb 2018 13:14:24 +0000 (14:14 +0100)
commit1366a78db9e1f4de6971bebf9caeca9bb2b30bd4
tree0a4f8fc55b0f375e8bca30d1f1c1d5352dab1802tree | snapshot (tar.gz zip)
parent3b932dfa1b2fc268f4cef590b3b8cffda42d91cbcommit | diff
parent6f40b52e2dc9e1da426ddf883e06ed28108dfdaccommit | diff
Merge remote-tracking branch 'refs/remotes/origin/2.1' into 3.0

# Conflicts:
# wcfsetup/install/files/js/3rdParty/redactor/plugins/wbbcode.js
# wcfsetup/install/files/js/WCF.Message.js
wcfsetup/install/files/js/WCF.Message.js diff1 | diff2 | blob | history
WoltLab Suite Core (previously WoltLab Community Framework)