projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e5c2467 49c6afa)
Merge branch 'master' into next
authorAlexander Ebert <ebert@woltlab.com>
Thu, 2 Jul 2015 08:52:16 +0000 (10:52 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 2 Jul 2015 08:52:16 +0000 (10:52 +0200)
Conflicts:
com.woltlab.wcf/package.xml
wcfsetup/install/files/js/3rdParty/redactor/plugins/wcombined.min.js

1  2 
wcfsetup/install/lang/de.xml patch | diff1 | diff2 | blob | history
wcfsetup/install/lang/en.xml patch | diff1 | diff2 | blob | history

diff --cc wcfsetup/install/lang/de.xml
Simple merge
diff --cc wcfsetup/install/lang/en.xml
Simple merge
WoltLab Suite Core (previously WoltLab Community Framework)