Merge branch 'update-dependencies'

dstockto · Dec 29, 2014 · 9d241a8 · 9d241a8
2 parents 36a42c2 + 40b6ac7
commit 9d241a8
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 76 deletions.
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
-        "phergie/phergie-irc-bot-react": "dev-master"
+        "phergie/phergie-irc-bot-react": "~1"
     },
     "require-dev": {
         "phpunit/phpunit": "4.0.*",