projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d949e64 3d03808)
Merge branch '2.0'
authorMarcel Werk <burntime@woltlab.com>
Sun, 7 Sep 2014 13:21:46 +0000 (15:21 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 7 Sep 2014 13:21:46 +0000 (15:21 +0200)
Conflicts:
wcfsetup/install/files/lib/data/user/avatar/DefaultAvatar.class.php


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)