projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9739bf9 ab5e034)
Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Sun, 18 Jan 2015 23:47:59 +0000 (00:47 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sun, 18 Jan 2015 23:47:59 +0000 (00:47 +0100)
Conflicts:
com.woltlab.wcf/package.xml
wcfsetup/install/files/js/WCF.ImageViewer.min.js

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

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