projects / GitHub / WoltLab / WCF.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 89484ba 5bff8b4)
Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Tue, 26 Sep 2017 11:39:32 +0000 (13:39 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 26 Sep 2017 11:39:32 +0000 (13:39 +0200)
commit0543a7fae9f195d85caf038e915d747756202ce4
tree9978e8610f5f630cb8697d627708eb8625618eb2tree | snapshot (tar.gz zip)
parent89484ba030439d701c0c6302b7bf9372389426d0commit | diff
parent5bff8b47f57bc294bc39b185a0a4926112aca8e0commit | diff
Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:
# wcfsetup/install/files/js/3rdParty/redactor2/plugins/combined.min.js
# wcfsetup/install/files/js/3rdParty/redactor2/redactor.min.js
# wcfsetup/install/files/js/WoltLabSuite.Core.min.js
wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeProcessor.class.php diff1 | diff2 | blob | history
WoltLab Suite Core (previously WoltLab Community Framework)