Merge remote-tracking branch 'origin/stable45'

Conflicts:
	developer_manual/index.rst
This commit is contained in:
Daniel Molkentin
2013-01-03 13:00:30 +01:00

View File

@@ -7,11 +7,11 @@ Contents
:maxdepth: 2
codingguidelines
getting_started
tutorial
angular
templates
unittests
translation
debugging
configfile
security
@@ -24,7 +24,6 @@ Contents
translation
testing
database
getting_started
filesystem
hooks
theming