1
0
mirror of https://github.com/danog/dns.git synced 2025-01-23 05:51:11 +01:00

Merge branch '0.2'

Conflicts:
	composer.lock
This commit is contained in:
Daniel Lowrey 2014-08-05 17:47:07 -04:00
commit 34da0f66b8

View File

@ -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": {