Merge github.com:justmwa/acme.sh

Conflicts:
	dnsapi/README.md
	dnsapi/dns_nsone.sh
This commit is contained in:
nytral
2017-05-08 16:02:31 +02:00
3 changed files with 8 additions and 2 deletions

View File

@ -1,4 +1,6 @@
#!/bin/bash
<<<<<<< HEAD
#!/usr/bin/env sh
>>>>>>> 9201e0a5b905812da1157efa075dd1ab52362c09
# bug reports to dev@1e.ca