projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 027800d 2768a8d)
Merge branch 'refs/heads/master' into cli
authorMatthias Schmidt <gravatronics@live.com>
Fri, 27 Sep 2013 13:31:56 +0000 (15:31 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 27 Sep 2013 13:31:56 +0000 (15:31 +0200)
1  2 
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 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)