projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f28efd5 4fe792a)
Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 16 Jan 2012 18:29:44 +0000 (19:29 +0100)
committerMarcel Werk <burntime@woltlab.com>
Mon, 16 Jan 2012 18:29:44 +0000 (19:29 +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)