Commitf972c47

committed

Merge branch 'fix-cookbook_sessions_mapping' of git://github.com/iamdto/symfony-docs into iamdto-fix-cookbook_sessions_mapping

Conflicts:cookbook/map.rst.inc

2 parents45e1470 +d412a9e commitf972c47Copy full SHA for f972c47

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -108,10 +108,6 @@`
`108`	`108`	* :doc:`/cookbook/request/mime_type`
`109`	`109`	* (session) :doc:`/cookbook/session/locale_sticky_session`
`110`	`110`
`111`		-* :doc:`/cookbook/session/index`
`112`		`-`
`113`		-* :doc:`/cookbook/session/php_bridge`
`114`		`-`
`115`	`111`	* :doc:`/cookbook/routing/index`
`116`	`112`
`117`	`113`	* :doc:`/cookbook/routing/scheme`
`@@ -150,6 +146,7 @@`
`150`	`146`	* :doc:`/cookbook/session/proxy_examples`
`151`	`147`	* :doc:`/cookbook/session/locale_sticky_session`
`152`	`148`	* :doc:`/cookbook/session/sessions_directory`
	`149`	+* :doc:`/cookbook/session/php_bridge`
`153`	`150`
`154`	`151`	`*symfony1`
`155`	`152`

Lines changed: 1 addition & 1 deletion

Comments

(0)