projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6570e38 eb69a2e)
Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 25 Apr 2013 13:27:57 +0000 (15:27 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 25 Apr 2013 13:27:57 +0000 (15:27 +0200)
1  2 
com.woltlab.wcf/acpMenu.xml 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
wcfsetup/setup/db/install.sql patch | diff1 | diff2 | blob | history

diff --cc com.woltlab.wcf/acpMenu.xml
Simple merge
diff --cc wcfsetup/install/lang/de.xml
Simple merge
diff --cc wcfsetup/install/lang/en.xml
Simple merge
diff --cc wcfsetup/setup/db/install.sql
Simple merge
WoltLab Suite Core (previously WoltLab Community Framework)