Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

License update to dual MIT and Apache 2 #6301

Merged
merged 6 commits into from May 6, 2019
Merged

License update to dual MIT and Apache 2 #6301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6bd310d
License update to dual MIT and Apache 2
momack2 May 6, 2019
4941b49
Create COPYRIGHT
momack2 May 6, 2019
c1b7003
Create LICENSE-APACHE
momack2 May 6, 2019
407a375
add transitional comments
momack2 May 6, 2019
52aa24d
Delete LICENSE
momack2 May 6, 2019
e421447
Update COPYRIGHT
momack2 May 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions COPYRIGHT
View file
Open in desktop
@@ -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-05-06 and not contributed by
a user listed in [this signoff issue](https://github.com/ipfs/go-ipfs/issues/6302) is
licensed under MIT-only. All new contributions (and past contributions since 2019-05-06)
are licensed under a dual MIT/Apache-2.0 license.
5 changes: 5 additions & 0 deletions LICENSE-APACHE
View file
Open in desktop
@@ -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.
2 changes: 0 additions & 2 deletions LICENSE → LICENSE-MIT
View file
Open in desktop
@@ -1,7 +1,5 @@
The MIT License (MIT)

Copyright (c) 2014-2016 Juan Batiz-Benet

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
Expand Down