projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc3ccfe fc7d120)
Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Mon, 31 Jul 2017 15:30:55 +0000 (17:30 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 31 Jul 2017 15:30:55 +0000 (17:30 +0200)
# Conflicts:
# wcfsetup/install/files/js/3rdParty/redactor2/plugins/combined.min.js

1  2 
com.woltlab.wcf/templates/wysiwyg.tpl patch | diff1 | diff2 | blob | history
wcfsetup/install/files/acp/templates/wysiwyg.tpl patch | diff1 | diff2 | blob | history

diff --cc com.woltlab.wcf/templates/wysiwyg.tpl
Simple merge
WoltLab Suite Core (previously WoltLab Community Framework)