Skip to content
This repository was archived by the owner on Mar 10, 2020. It is now read-only.

Updated the license as mentioned in issue #1177 #1179

Merged
merged 5 commits into from
Nov 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions COPYRIGHT
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
This project is transitioning from an MIT-only license to a dual MIT/Apache-2.0 license.
Unless otherwise noted, all code contributed prior to 2019-11-26 and not contributed by
a user listed in [this signoff issue](https://github.com/ipfs/js-ipfs-http-client/issues/1189) is
licensed under MIT-only. All new contributions (and past contributions since 2019-11-29)
are licensed under a dual MIT/Apache-2.0 license.
5 changes: 5 additions & 0 deletions LICENSE-APACHE
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
File renamed without changes.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
],
"homepage": "https://github.com/ipfs/js-ipfs-http-client",
"bugs": "https://github.com/ipfs/js-ipfs-http-client/issues",
"license": "MIT",
"license": "(Apache-2.0 OR MIT)",
"leadMaintainer": "Alan Shaw <alan@tableflip.io>",
"files": [
"src",
Expand Down