From d4aa17436700713fcb4eb5c4a2c48182f37c3b5e Mon Sep 17 00:00:00 2001
From: Bertrand Dunogier <bd@ez.no>
Date: Wed, 23 Dec 2015 16:45:24 +0100
Subject: Updated composer.lock

Had to restrict scheb/two-factor-bundle to ~1.4.0 because of a circular service reference.
See https://github.com/scheb/two-factor-bundle/issues/33.

Also updated php version requirement to 5.5.0.
---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'composer.json')

diff --git a/composer.json b/composer.json
index 26608cdc..29784d5c 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
         "issues": "https://github.com/wallabag/wallabag/issues"
     },
     "require": {
-        "php": ">=5.3.3",
+        "php": ">=5.5.0",
         "symfony/symfony": "~2.7.0",
         "doctrine/orm": "~2.3",
         "doctrine/doctrine-bundle": "1.5.2",
@@ -55,7 +55,7 @@
         "j0k3r/graby": "~1.0",
         "friendsofsymfony/user-bundle": "dev-master",
         "friendsofsymfony/oauth-server-bundle": "^1.4@dev",
-        "scheb/two-factor-bundle": "~1.4",
+        "scheb/two-factor-bundle": "~1.4.0",
         "grandt/phpepub": "~4.0",
         "wallabag/php-mobi": "~1.0.0",
         "kphoen/rulerz-bundle": "~0.10"
-- 
cgit v1.2.3