Skip to content

Commit

Permalink
Merge upstream/master into feature/cls-hooked-2 to sync with upstream…
Browse files Browse the repository at this point in the history
… repo

Fix comment
  • Loading branch information
josieusa committed Sep 9, 2016
1 parent 0e051bd commit 0759ad5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion browser/current-context.js
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion server/middleware/per-request.js
Original file line number Diff line number Diff line change
@@ -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

Expand Down

0 comments on commit 0759ad5

Please sign in to comment.