Merge branch 'master' into dev

# Conflicts: # daemon/daemon.go # systemservices/deployer/deployer_test.go # systemservices/systemservices.go
mesg-foundation · Jan 25, 2019 · fc4e57b · fc4e57b
2 parents 14973ff + 433fede
commit fc4e57b
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 42 deletions.
diff --git a/protobuf/coreapi/api.pb.go b/protobuf/coreapi/api.pb.go
diff --git a/protobuf/coreapi/api.proto b/protobuf/coreapi/api.proto
@@ -11,7 +11,7 @@ option go_package = "coreapi";
 //
 // Services must not use this API, but rather use the [Service API](./service.md).
 //
-// The source file of this API is hosted on [GitHub](https://github.com/mesg-foundation/core/blob/master/api/core/api.proto).
+// The source file of this API is hosted on [GitHub](https://github.com/mesg-foundation/core/blob/master/protobuf/coreapi/api.proto).
 service Core {
   // Subscribe to a stream that listens for events from a service.
   rpc ListenEvent (ListenEventRequest) returns (stream EventData) {}

diff --git a/protobuf/serviceapi/api.pb.go b/protobuf/serviceapi/api.pb.go
diff --git a/protobuf/serviceapi/api.proto b/protobuf/serviceapi/api.proto
@@ -11,7 +11,7 @@ option go_package = "serviceapi";
 //
 // Applications must not use this API, but rather use the [Core API](./core.md).
 //
-// The source file of this API is hosted on [GitHub](https://github.com/mesg-foundation/core/blob/master/api/service/api.proto).
+// The source file of this API is hosted on [GitHub](https://github.com/mesg-foundation/core/blob/master/protobuf/serviceapi/api.proto).
 service Service {
   // Emit an event to Core.
   // The event and its data must be defined in the [service's definition file](../guide/service/service-file.md).