projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 32f6cd9 f19a997)
Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 8 Mar 2012 21:25:14 +0000 (22:25 +0100)
committerMarcel Werk <burntime@woltlab.com>
Thu, 8 Mar 2012 21:25:14 +0000 (22:25 +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)