projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 632ca9f a46dd92)
Merge branch '2.0'
authorTim Düsterhus <duesterhus@woltlab.com>
Sun, 1 Feb 2015 18:06:57 +0000 (19:06 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Sun, 1 Feb 2015 18:06:57 +0000 (19:06 +0100)
Conflicts:
com.woltlab.wcf/package.xml


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)