Skip to content

Commit

Permalink
docs: switch license to dual MIT and Apache 2 (ipfs#1179)
Browse files Browse the repository at this point in the history
  • Loading branch information
sarthak0906 authored and alanshaw committed Nov 29, 2019
1 parent d95b8f1 commit f77819c
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 1 deletion.
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

0 comments on commit f77819c

Please sign in to comment.