projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6c64fa 14293a7)
Merge branch 'master' into notifications
authorAlexander Ebert <ebert@woltlab.com>
Wed, 25 Jun 2014 18:19:11 +0000 (20:19 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 25 Jun 2014 18:19:11 +0000 (20:19 +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)