projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fffbbc1 2bb12ec)
Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Wed, 4 Jun 2014 19:44:17 +0000 (21:44 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 4 Jun 2014 19:44:17 +0000 (21:44 +0200)
Conflicts:
wcfsetup/install/files/js/WCF.min.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)