projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 899e235 5df2b07)
Merge branch '2.0'
authorMatthias Schmidt <gravatronics@live.com>
Sat, 16 Aug 2014 18:09:17 +0000 (20:09 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 16 Aug 2014 18:09:17 +0000 (20:09 +0200)
Conflicts:
wcfsetup/install/files/js/WCF.Message.js


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)