projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b18bb1d 066f39a)
Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 8 Aug 2012 12:06:44 +0000 (14:06 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 8 Aug 2012 12:06:44 +0000 (14:06 +0200)
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)