projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 424b868 3abc3a0)
Merge pull request #1660 from joshuaruesweg/patch-10
authorMarcel Werk <burntime@woltlab.com>
Mon, 3 Mar 2014 20:47:35 +0000 (21:47 +0100)
committerMarcel Werk <burntime@woltlab.com>
Mon, 3 Mar 2014 20:47:35 +0000 (21:47 +0100)
adding MODULE_SMILEY and remove defined


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)