swarm, cmd/swarm: Merge branch 'master' into multiple-ens-endpoints

2018-02-22 18:50:47 +01:00
parent a3a07350dc 221486a291
commit 6a9730edaa
148 changed files with 3432 additions and 3865 deletions
--- a/swarm/api/http/error_templates.go
+++ b/swarm/api/http/error_templates.go
--- a/swarm/api/http/error_test.go
+++ b/swarm/api/http/error_test.go
@ -1,4 +1,4 @@
-// Copyright 2016 The go-ethereum Authors
+// Copyright 2017 The go-ethereum Authors
 // This file is part of the go-ethereum library.
 //
 // The go-ethereum library is free software: you can redistribute it and/or modify
--- a/swarm/api/http/server_test.go
+++ b/swarm/api/http/server_test.go
--- a/swarm/api/http/templates.go
+++ b/swarm/api/http/templates.go