From 86e9f2b9ca1527683a17e485dfa9d2c246033674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Barray?= <tim@amicalement-web.net>
Date: Thu, 28 Aug 2014 11:46:01 +0200
Subject: [PATCH] update deps

---
 .gitignore    | 3 +++
 composer.json | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0306fe3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/bin/*
+/vendor/*
+composer.lock
diff --git a/composer.json b/composer.json
index e453572..ec2525d 100644
--- a/composer.json
+++ b/composer.json
@@ -12,8 +12,8 @@
 
     "require": {
         "php": ">=5.3.2",
-        "behat/behat": "~2.5.0",
-        "behat/symfony2-extension": "~1.1",
+        "behat/behat": "~3.0",
+        "behat/symfony2-extension": "dev-master",
         "atoum/atoum": "dev-master"
     },
 
@@ -23,7 +23,7 @@
 
     "extra": {
         "branch-alias": {
-            "dev-master": "0.1.x-dev"
+            "dev-master": "1.0.x-dev"
         }
     }
 }