Merge branch '1.x'

willdurand · willdurand · commit 8f5c55632aad · 2016-02-04T21:16:23.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,6 @@ language: php
 php:
   - 5.3
   - 5.4
-  - 5.5
   - 5.6
   - 7.0
   - hhvm
@@ -17,9 +16,11 @@ matrix:
     - php: 5.6
       env: SYMFONY_VERSION='2.3.*'
     - php: 5.6
-      env: SYMFONY_VERSION='2.8.*@dev'
+      env: SYMFONY_VERSION='2.5.*'
     - php: 5.6
-      env: SYMFONY_VERSION='3.0.*@dev'
+      env: SYMFONY_VERSION='2.8.*'
+    - php: 5.6
+      env: SYMFONY_VERSION='3.0.*'
 
 sudo: false
 
diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
     "authors": [
         {
             "name": "William Durand",
-            "email": "william.durand1@gmail.com"
+            "email": "will+git@drnd.me"
         },
         {
             "name": "FriendsOfSymfony Community",

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`"authors": [`
`9`	`9`	`{`
`10`	`10`	`"name": "William Durand",`
`11`		`- "email": "[email protected]"`
	`11`	`+ "email": "[email protected]"`
`12`	`12`	`},`
`13`	`13`	`{`
`14`	`14`	`"name": "FriendsOfSymfony Community",`