projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c6bfa74 ee490f0)
Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Sun, 4 May 2014 23:46:47 +0000 (01:46 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 4 May 2014 23:46:47 +0000 (01:46 +0200)
Conflicts:
com.woltlab.wcf/package.xml
wcfsetup/install/files/js/WCF.min.js
wcfsetup/install/files/lib/system/WCF.class.php

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)