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

Remove outdated entries from LICENSE (uplift to 0.73.x) #3887

Merged
merged 1 commit into from
Nov 5, 2019
Merged

Remove outdated entries from LICENSE (uplift to 0.73.x) #3887

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 3 additions & 24 deletions LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,5 @@
LICENSES FOR INCORPORATED CODEBASES
===================================

Incorporating code from Privacy Badger Chrome,
https://github.com/EFForg/privacybadger
Copyright © 2015 Electronic Frontier Foundation and other contributors
Licensed GPL v3

Incorporating code from HTTPS Everywhere,
Copyright © 2010-2017 Electronic Frontier Foundation and others
Licensed GPL v2+

Incorporating code from Chameleon,
https://github.com/ghostwords/chameleon
Copyright © 2015 ghostwords
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/.
Alternatively, this code may be distributed or
otherwise used under the terms of GPL v3

Text of Mozilla Public License Version 2.0
==========================================
Mozilla Public License Version 2.0
==================================

1. Definitions
--------------
Expand Down Expand Up @@ -378,7 +357,7 @@ Exhibit A - Source Code Form License Notice

This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/.
file, You can obtain one at https://mozilla.org/MPL/2.0/.

If it is not possible or desirable to put the notice in a particular
file, then You may include the notice in a location (such as a LICENSE
Expand Down