projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad2694a 5029693)
Merge branch 'master' into remoteFileFix
authorTim Düsterhus <timwolla@arcor.de>
Fri, 18 May 2012 12:35:29 +0000 (14:35 +0200)
committerTim Düsterhus <timwolla@arcor.de>
Fri, 18 May 2012 12:35:29 +0000 (14:35 +0200)
Conflicts:
wcfsetup/install/files/lib/system/io/File.class.php


Trivial merge
WoltLab Suite Core (previously WoltLab Community Framework)