Merge branch '2.7' into 2.8

fabpot · fabpot · commit db67d0209195 · 2016-02-22T16:41:58.000+01:00
* 2.7:
  Added empty disallow field to robots.txt to comply with the Robot Exclusion Standard
  Move the placeholder for assets version in config.yml
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -21,7 +21,6 @@ framework:
     #serializer:      { enable_annotations: true }
     templating:
         engines: ['twig']
-        #assets_version: SomeVersionScheme
     default_locale:  "%locale%"
     trusted_hosts:   ~
     trusted_proxies: ~
diff --git a/web/robots.txt b/web/robots.txt
@@ -2,3 +2,4 @@
 # www.google.com/support/webmasters/bin/answer.py?hl=en&answer=156449
 
 User-agent: *
+Disallow:

Original file line number	Diff line number	Diff line change
`@@ -2,3 +2,4 @@`
`2`	`2`	`# www.google.com/support/webmasters/bin/answer.py?hl=en&answer=156449`
`3`	`3`
`4`	`4`	`User-agent: *`
	`5`	`+Disallow:`