Merge pull request #28024 from element-hq/langleyd/change_license

Change Licence
tchapgouv · Sep 9, 2024 · 7b8d9d3 · 7b8d9d3
2 parents f937dea + ea89fe3
commit 7b8d9d3
Show file tree

Hide file tree

Showing 56 changed files with 1,505 additions and 775 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,12 +1,6 @@
 # Contributing code to Element Web
 
-Everyone is welcome to contribute code to Element Web, provided that they are
-willing to license their contributions under the same license as the project
-itself. We follow a simple 'inbound=outbound' model for contributions: the act
-of submitting an 'inbound' contribution means that the contributor agrees to
-license the code under the same terms as the project's overall 'outbound'
-license - in this case, Apache Software License v2 (see
-[LICENSE](LICENSE)).
+Everyone is welcome to contribute code to Element Web, provided that they are willing to license their contributions to Element under a [Contributor License Agreement](https://cla-assistant.io/element-hq/element-web) (CLA). This ensures that their contribution will be made available under an OSI-approved open-source license, currently licensed under Affero General Public License v3 (AGPLv3) or General Public License v3 (GPLv3) at your choice.
 
 ## How to contribute
 

diff --git a/LICENSE b/LICENSE