projects / GitHub / WoltLab / WCF.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f3b71b9 d53752b)
Merge branch 'refs/heads/master' into enhancement/categoryLangVar
authorMatthias Schmidt <gravatronics@live.com>
Fri, 13 Jul 2012 14:17:21 +0000 (16:17 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 13 Jul 2012 14:17:21 +0000 (16:17 +0200)
commitf9c2704ed8d2894e90b76228d5f3f41194cfacb0
treedf4bb1b869b527977a06b1eae07f9dac442431c0tree | snapshot (tar.gz zip)
parentf3b71b96dc530c9bbdb363415661aeeb9ae500f2commit | diff
parentd53752be7b62f03297ef71822bad593f2ce41a2ecommit | diff
Merge branch 'refs/heads/master' into enhancement/categoryLangVar

Conflicts:
wcfsetup/install/files/acp/templates/categoryAdd.tpl
wcfsetup/install/files/acp/templates/categoryAdd.tpl diff1 | diff2 | blob | history
WoltLab Suite Core (previously WoltLab Community Framework)