Merge branch '0.2'

Conflicts: composer.lock
amphp · Aug 5, 2014 · 34da0f6 · 34da0f6
2 parents 8fc26b5 + c90bea0
commit 34da0f6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "rdlowrey/alert": "~0.9.0",
+        "rdlowrey/alert": "~0.10.0",
         "daverandom/libdns": "~0.2.1"
     },
     "require-dev": {