projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 13acb71 45c5c8e)
Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Sat, 24 May 2014 10:49:58 +0000 (12:49 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 24 May 2014 10:49:58 +0000 (12:49 +0200)
Conflicts:
wcfsetup/install/files/js/WCF.Message.js
wcfsetup/install/files/js/WCF.Message.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)