aboutsummaryrefslogtreecommitdiff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorJakob Borg <jakob@nym.se>2015-03-07 21:36:35 +0100
committerJakob Borg <jakob@nym.se>2015-03-17 16:02:27 +0100
commit32425c556130ed88200869e669eafcf6344b200c (patch)
treeb157a1b04bc5af9a0f203f273e120d60c641ee88 /CONTRIBUTING.md
parent8d20923881e1842c6dd4ba80afee51899547a6b5 (diff)
downloadsyncthing-32425c556130ed88200869e669eafcf6344b200c.tar.gz
syncthing-32425c556130ed88200869e669eafcf6344b200c.zip
MPLv2
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index adf1ec684..c5346ddb8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -93,8 +93,8 @@ The Syncthing core team currently consists of the following members;
## Licensing
-All contributions are made under the same GPL license as the rest of the
-project, except documentation, user interface text and translation
+All contributions are made under the same MPLv2 license as the rest of
+the project, except documentation, user interface text and translation
strings which are licensed under the Creative Commons Attribution 4.0
International License. You retain the copyright to code you have
written.
@@ -137,4 +137,4 @@ Yes please!
## License
-GPLv3
+MPLv2