docs: switch license to dual MIT and Apache 2 (ipfs#1179)

galtproject · Nov 29, 2019 · f77819c · f77819c
1 parent d95b8f1
commit f77819c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/COPYRIGHT b/COPYRIGHT
@@ -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.
diff --git a/LICENSE-APACHE b/LICENSE-APACHE
@@ -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.
diff --git a/LICENSE → LICENSE-MIT b/LICENSE → LICENSE-MIT
diff --git a/package.json b/package.json
@@ -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",