projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a3765d0 023e3a9)
Merge branch 'master' into sniffer
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 20 Dec 2012 15:11:29 +0000 (16:11 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Thu, 20 Dec 2012 15:11:29 +0000 (16:11 +0100)
Conflicts:
wcfsetup/install/files/lib/system/template/plugin/StaticlangTemplatePluginCompiler.class.php


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)