Matthew Holt 2ed1dd6afc Merge branch 'master' into acmev2 ... # Conflicts: # caddyhttp/httpserver/replacer.go # caddyhttp/httpserver/replacer_test.go		2018-03-25 21:56:11 -06:00
..
storagetest
certificates.go
certificates_test.go
client.go
client_test.go
config.go
config_test.go
crypto.go
crypto_test.go
filestorage.go
filestorage_test.go
filestoragesync.go
handshake.go	tls: Fall back to certificate keyed by empty name (fixes #2035) (#2037)	2018-03-17 17:03:12 -06:00
handshake_test.go
httphandler.go
httphandler_test.go
maintain.go
setup.go	Merge branch 'master' into acmev2	2018-03-25 21:56:11 -06:00
setup_test.go
storage.go
tls.go
tls_test.go
user.go
user_test.go