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:
commit
34da0f66b8
@ -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": {
|
||||
|
Loading…
x
Reference in New Issue
Block a user