projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 921dfb3 0293c6a)
Merge branch '2.0'
authorAlexander Ebert <ebert@woltlab.com>
Sat, 5 Apr 2014 23:42:45 +0000 (01:42 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 5 Apr 2014 23:42:45 +0000 (01:42 +0200)
Conflicts:
com.woltlab.wcf/package.xml
wcfsetup/install/files/js/WCF.Message.js
wcfsetup/install/files/js/WCF.Message.min.js
wcfsetup/install/files/js/WCF.min.js


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)