projects / GitHub / WoltLab / WCF.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5c56d5a e563f9f)
Merge remote-tracking branch 'origin/master'
authorTim Düsterhus <timwolla@arcor.de>
Thu, 16 May 2013 19:44:39 +0000 (21:44 +0200)
committerTim Düsterhus <timwolla@arcor.de>
Thu, 16 May 2013 19:44:39 +0000 (21:44 +0200)
commit4d0d33a9b0859b947897da850fac616f28e028a1
tree90f00c30c27644f9294493accbf98156f7b2d84atree | snapshot (tar.gz zip)
parent5c56d5a6662fa35598a685088a163c6e5b3345cccommit | diff
parente563f9ff39cabc7155ee5215e4663244fcc9d4fdcommit | diff
Merge remote-tracking branch 'origin/master'

Conflicts:
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/de.xml diff1 | diff2 | blob | history
WoltLab Suite Core (previously WoltLab Community Framework)