git.stricted.de - GitHub/WoltLab/WCF.git/commit

projects / GitHub / WoltLab / WCF.git / commit

author	Matthias Schmidt <gravatronics@live.com>
	Sun, 14 Oct 2012 06:51:38 +0000 (08:51 +0200)
committer	Matthias Schmidt <gravatronics@live.com>
	Sun, 14 Oct 2012 06:51:38 +0000 (08:51 +0200)
commit	32e64f5f9770b98b9d526a063bdde4790b7606fc
tree	0df10f5caffa5d51736e886c0e10315fbad59815	tree \| snapshot (tar.gz zip)
parent	7485c55b988825f2de3aa42a4c4a9c62644c4134	commit \| diff
parent	dc8fe3e064b96895388876ec12f56bafa7672304	commit \| diff

Merge branch 'master' of git://github.com/WoltLab/WCF into enhancement/acpPageTitle

Conflicts:
wcfsetup/install/files/acp/templates/categoryAdd.tpl
wcfsetup/install/files/acp/templates/categoryList.tpl
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml

WoltLab Suite Core (previously WoltLab Community Framework)

RSS Atom

wcfsetup/install/files/acp/templates/cacheList.tpl	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/acp/templates/header.tpl	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/acp/templates/option.tpl	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/acp/templates/optionImport.tpl	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/acp/templates/userMail.tpl	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/acp/templates/userSearch.tpl	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/de.xml	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/en.xml	diff1 \|	diff2 \|	blob \| history