github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-25 17:56:34 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
b019501b8b
caddy/caddyfile
History
Matthew Holt b019501b8b
Merge branch 'master' into telemetry 
# Conflicts:
#	caddy/caddymain/run.go
#	caddyhttp/httpserver/plugin.go
#	caddytls/client.go
2018-04-20 00:03:57 -06:00
..
testdata Rewrote Caddy from the ground up; initial commit of 0.9 branch 2016-06-04 17:00:29 -06:00
dispenser_test.go Apply Apache license to all .go source files (closes #1865) 2017-09-22 23:56:58 -06:00
dispenser.go Apply Apache license to all .go source files (closes #1865) 2017-09-22 23:56:58 -06:00
json_test.go Apply Apache license to all .go source files (closes #1865) 2017-09-22 23:56:58 -06:00
json.go Apply Apache license to all .go source files (closes #1865) 2017-09-22 23:56:58 -06:00
lexer_test.go Apply Apache license to all .go source files (closes #1865) 2017-09-22 23:56:58 -06:00
lexer.go Apply Apache license to all .go source files (closes #1865) 2017-09-22 23:56:58 -06:00
parse_test.go caddyfile: Fix errors caught by fuzzing (#2097) 2018-04-03 11:54:32 -06:00
parse.go Merge branch 'master' into telemetry 2018-04-20 00:03:57 -06:00