Merge branch 'release-1.x'

OpenConext · Nov 12, 2015 · 9239dea · 9239dea
2 parents dde781d + 378a017
commit 9239dea
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 23 deletions.
diff --git a/composer.json b/composer.json
@@ -28,7 +28,8 @@
         "surfnet/stepup-saml-bundle": "dev-develop",
         "surfnet/stepup-bundle": "dev-develop",
         "symfony/swiftmailer-bundle": "~2.3",
-        "surfnet/stepup-u2f-bundle": "dev-develop"
+        "surfnet/stepup-u2f-bundle": "dev-develop",
+        "mopa/composer-bridge": "dev-master as v1.5.0"
     },
     "require-dev": {
         "matthiasnoback/symfony-config-test": "^1.2.0",

diff --git a/composer.lock b/composer.lock