Merge branch 'hotfix/1.0.3'

isotope · Nov 30, 2015 · dfa14a8 · dfa14a8
2 parents 0c83f15 + ae87f68
commit dfa14a8
Show file tree

Hide file tree

Showing 4 changed files with 687 additions and 607 deletions.
diff --git a/composer.json b/composer.json
@@ -18,12 +18,12 @@
         "symfony/translation": "~2.3",
         "symfony/config": "~2.3",
         "symfony/twig-bridge": "~2.3",
-        "doctrine/dbal": "2.4.*"
+        "doctrine/dbal": "~2.4"
     },
     "require-dev": {
         "phpunit/dbunit": "1.3.*",
         "symfony/finder": "~2.4",
-        "phine/phar": "1.0",
+        "phine/phar": "1.*",
         "symfony/browser-kit": "~2.5"
     }
 }