Anthony Lapenna 0bd599f98a fix(api): remove git conflict trace

2016-08-17 18:16:01 +12:00

..

api.go

refactor(global): replace /config endpoint with /settings to avoid confusion (#98)

2016-08-03 21:13:17 +12:00

csrf.go

refactor(api): create a new structure for the Go api (#94)

2016-08-01 13:40:12 +12:00

exec.go

feat(global): add container exec support (#97)

2016-08-03 15:12:53 +12:00

flags.go

feat(global): add container exec support (#97)

2016-08-03 15:12:53 +12:00

handler.go

refactor(global): replace /config endpoint with /settings to avoid confusion (#98)

2016-08-03 21:13:17 +12:00

hijack.go

feat(global): add container exec support (#97)

2016-08-03 15:12:53 +12:00

main.go

fix(api): remove git conflict trace

2016-08-17 18:16:01 +12:00

settings.go

Revert "refactor(global): revert merge with internal (#133)"

2016-08-17 18:09:55 +12:00

ssl.go

feat(global): add container exec support (#97)

2016-08-03 15:12:53 +12:00

unix_handler.go

refactor(api): create a new structure for the Go api (#94)

2016-08-01 13:40:12 +12:00