projects / GitHub / WoltLab / WCF.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6939b35 0999362)
Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Thu, 23 Nov 2017 16:54:12 +0000 (17:54 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 23 Nov 2017 16:54:12 +0000 (17:54 +0100)
commit741b071847e1d821b6cc6e0670291a3b269ec732
treee8a0723ac868172d6aff0213f618b72b2eead777tree | snapshot (tar.gz zip)
parent6939b35c59429c3357537e508f5d6b4db42b3fa1commit | diff
parent099936200b3503d31e0e19c1884e25b5f2e1c8a7commit | diff
Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:
# com.woltlab.wcf/package.xml
# wcfsetup/install/files/js/3rdParty/redactor2/plugins/combined.min.js
# wcfsetup/install/files/js/WoltLabSuite.Core.min.js
# wcfsetup/install/files/lib/system/WCF.class.php
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Redactor/Format.js diff1 | diff2 | blob | history
WoltLab Suite Core (previously WoltLab Community Framework)