aboutsummaryrefslogtreecommitdiff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorJakob Borg <jakob@nym.se>2014-09-29 21:43:32 +0200
committerJakob Borg <jakob@nym.se>2014-10-01 07:53:59 +0200
commit9edce23e76c7fb66a39187aee02b12a1fd313581 (patch)
tree20fb87f8c7fcfb8c99074863911c7e9d26128d8c /CONTRIBUTING.md
parent756a8a35e3660fc530907655cac47876a3e03e69 (diff)
downloadsyncthing-9edce23e76c7fb66a39187aee02b12a1fd313581.tar.gz
syncthing-9edce23e76c7fb66a39187aee02b12a1fd313581.zip
Relicense to GPL
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md11
1 files changed, 6 insertions, 5 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0d55f12b1..b3651de61 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -52,10 +52,11 @@ accepted. This means to make sure that the pull request:
## Licensing
-All contributions are made under the same MIT License as the rest of the
-project, except documentation which is licensed under the Creative
-Commons Attribution 4.0 International License. You retain the copyright
-to code you have written.
+All contributions are made under the same GPL 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.
When accepting your first contribution, the maintainer of the project
will ensure that you are added to the CONTRIBUTORS file. You are welcome
@@ -101,4 +102,4 @@ Yes please!
## License
-MIT
+GPLv3