projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 60fe64f 9465969)
Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 6 May 2014 19:30:50 +0000 (21:30 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 6 May 2014 19:30:50 +0000 (21:30 +0200)
1  2 
wcfsetup/install/files/js/WCF.js patch | diff1 | diff2 | blob | history
wcfsetup/install/lang/de.xml patch | diff1 | diff2 | blob | history

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