Merge upstream/master into master to sync with upstream repo

Fix comment
2016-09-09 14:24:53 +02:00 · 2016-09-09 14:24:53 +02:00 · c96e37c99d
parent 8433e75a24
commit c96e37c99d
2 changed files with 2 additions and 2 deletions
--- a/browser/current-context.js
+++ b/browser/current-context.js
@ -1,5 +1,5 @@
 // Copyright IBM Corp. 2015. All Rights Reserved.
-// Node module: loopback-context-cls
+// Node module: loopback-context
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT

--- a/server/middleware/per-request.js
+++ b/server/middleware/per-request.js
@ -1,5 +1,5 @@
 // Copyright IBM Corp. 2014,2016. All Rights Reserved.
-// Node module: loopback-context-cls
+// Node module: loopback-context
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT