Merge branch '2.1' into 2.2

dunglas · dunglas · commit d24ff9e80602 · 2018-07-06T17:33:23.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -33,4 +33,4 @@ deploy:
   local_dir: public
   fqdn: api-platform.com
   on:
-    branch: 2.2
+    branch: 2.3
