projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 931e10a 0ad655d)
Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Sat, 17 May 2014 15:13:08 +0000 (17:13 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 17 May 2014 15:13:08 +0000 (17:13 +0200)
Conflicts:
wcfsetup/install/files/js/WCF.Tagging.min.js

1  2 
wcfsetup/install/files/lib/util/DateUtil.class.php patch | diff1 | diff2 | blob | history
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)