diff options
| author | Matthew Holt <mholt@users.noreply.github.com> | 2019-07-11 17:07:52 -0600 |
|---|---|---|
| committer | Matthew Holt <mholt@users.noreply.github.com> | 2019-07-11 17:07:52 -0600 |
| commit | 4698352b20872557e624c54c1b4a1e0074f0baca (patch) | |
| tree | ac1c77bccd7a1d23cb8e1fd361ed334a3890a80c /.gitignore | |
| parent | 9343403358bd34b787a209b41c5b820781f78890 (diff) | |
| parent | eb8625f7744ba5e72b51549adc086e45313267cb (diff) | |
Merge branch 'v2-handlers' into v2
# Conflicts:
# modules/caddyhttp/caddyhttp.go
# modules/caddyhttp/fileserver/staticfiles.go
# modules/caddyhttp/routes.go
# modules/caddyhttp/server.go
# modules/caddyhttp/staticresp.go
# modules/caddyhttp/staticresp_test.go
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions