Merge pull request #5 from WeareJH/develop

Update dependencies
WeareJH · Jun 11, 2015 · 79b6e89 · 79b6e89
2 parents 90f6384 + 40e675b
commit 79b6e89
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 61 deletions.
diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
         "class": "Jh\\StaticsMerger\\StaticsMergerPlugin"
     },
     "require": {
-        "composer-plugin-api": "1.0.0"
+        "composer-plugin-api": "^1.0"
     },
     "require-dev": {
         "composer/composer": "dev-master",

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