projects / GitHub / WoltLab / WCF.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cba8486 34f8da0)
Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 8 Oct 2014 20:15:04 +0000 (22:15 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 8 Oct 2014 20:15:04 +0000 (22:15 +0200)
commit2b565f7b7162ab1918dafa65bba6e837d876a673
tree01e39ef60c33122ca7d02aae1551e0076f0b609etree | snapshot (tar.gz zip)
parentcba8486d88891ce6cf0581d1779f09ad6fc204dfcommit | diff
parent34f8da0891e13743ab5469952eb2145bed260858commit | diff
Merge branch 'master' of github.com:WoltLab/WCF

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