projects / GitHub / WoltLab / WCF.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f351e2a) | patch
Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Fri, 29 Dec 2017 12:44:35 +0000 (13:44 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 29 Dec 2017 12:44:35 +0000 (13:44 +0100)
commitb4ea9d269020219b97f889812e98db4969279a51
tree537baa8e08cf5f2657e34882bf9834f604d3649ctree | snapshot (tar.gz zip)
parentf351e2a7504f7d038a4d5507ba24dcc8b88e50e9commit | diff
Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:
# wcfsetup/install/files/js/WoltLabSuite/Core/Ui/TabMenu/Simple.js
wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabList.js diff | blob | blame | history
wcfsetup/install/files/js/WoltLabSuite/Core/Ui/TabMenu/Simple.js diff | blob | blame | history
WoltLab Suite Core (previously WoltLab Community Framework)