projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 65dd3ba cb19db2)
Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 28 Sep 2013 10:35:26 +0000 (12:35 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 28 Sep 2013 10:35:26 +0000 (12:35 +0200)
Conflicts:
wcfsetup/install/files/js/WCF.js

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)