Merge branch '2.0' into 2.1

dunglas · dunglas · commit fe8cbb533ca9 · 2018-01-12T18:57:36.000+01:00
diff --git a/features/integration/fos_user.feature b/features/integration/fos_user.feature
@@ -29,7 +29,7 @@ Feature: FOSUser integration
       "username": "dummy.user"
     }
     """
-    And the password "azerty" for user "1" should be hashed
+    And the password "azerty" for user 1 should be hashed
 
   @dropSchema
   Scenario: Delete a user

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ Feature: FOSUser integration`
`29`	`29`	`"username": "dummy.user"`
`30`	`30`	`}`
`31`	`31`	`"""`
`32`		`- And the password "azerty" for user "1" should be hashed`
	`32`	`+ And the password "azerty" for user 1 should be hashed`
`33`	`33`
`34`	`34`	`@dropSchema`
`35`	`35`	`Scenario: Delete a user`