tigerbot f2ce3e9fe1 Merge branch 'api-rewrite' into ddns ...

# Conflicts:
#	API.md
#	bin/goldilocks.js
#	etc/goldilocks/goldilocks.example.yml
#	lib/admin/apis.js
#	lib/app.js
#	lib/worker.js

2017-10-17 13:07:52 -06:00

..

http.js

Merge branch 'api-rewrite' into ddns

2017-10-17 13:07:52 -06:00

tls.js

removed the acme property from the tls config

2017-10-12 11:57:43 -06:00