Merge branch 'patch-3' of https://github.com/ivan386/go-ipfs into pat… · ipfs/kubo@a888ff3 · GitHub

Commit

Merge branch 'patch-3' of https://github.com/ivan386/go-ipfs into pat…

Browse files

…ch-3

Conflicts:
	core/corehttp/gateway_handler.go

Loading branch information

ivan386 committed Jun 22, 2017

2 parents 8b88b7f + 6beee88 commit a888ff3