projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 88a85f4 798ff2f)
Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 8 Nov 2011 18:57:06 +0000 (19:57 +0100)
committerMarcel Werk <burntime@woltlab.com>
Tue, 8 Nov 2011 18:57:06 +0000 (19:57 +0100)
1  2 
wcfsetup/install/files/js/WCF.js patch | diff1 | diff2 | blob | history

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