From 36228c0479f984a9daccd7e54e93bc7a61fef0c1 Mon Sep 17 00:00:00 2001 From: Ludovic Dubost Date: Tue, 4 Jun 2019 14:10:25 +0200 Subject: [PATCH 1/3] Updated team and contributing section Updated readme with a team section and an updated contributing section --- readme.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/readme.md b/readme.md index d12e2e376..1ca5c8971 100644 --- a/readme.md +++ b/readme.md @@ -62,13 +62,13 @@ via our [GitHub issue tracker](https://github.com/xwiki-labs/cryptpad/issues/), [Matrix channel](https://riot.im/app/#/room/#cryptpad:matrix.org), or by [e-mail](mailto:research@xwiki.com). +# Team + +CryptPad is actively developped by a team at [XWiki SAS](https://www.xwiki.com), a company developer of Open Source software since 2004 with Open-Source contributors from around the world. It has been funded between 2015-2019 through a research grant from the French state through [BPI France](https://www.bpifrance.fr/). It is currently funded by an 50KEuros NLNet Next-Generation Internet grant, subscribers of CryptPad.fr and our [Open-Collective](https://opencollective.com/cryptpad). + # Contributing -We love Open Source and we love contribution. It is our intent to keep this project available -under the AGPL license forever but in order to finance more development on this and other FOSS -projects, we also wish to sell other licenses to this software. Before making a pull request, -please read and -[sign the Commons Management Agreement](https://www.clahub.com/agreements/cjdelisle/cryptpad). +We love Open Source and we love contribution. Learn more about [contributing](https://github.com/xwiki-labs/cryptpad/wiki/Contributor-overview). If you have any questions or comments, or if you're interested in contributing to Cryptpad, come say hi on IRC, `#cryptpad` on Freenode. From 416a4a24463c09b2d779104d59a8a408cdf6682d Mon Sep 17 00:00:00 2001 From: ansuz Date: Tue, 4 Jun 2019 14:17:34 +0200 Subject: [PATCH 2/3] address some issues in the readme's team section --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 1ca5c8971..547ee073a 100644 --- a/readme.md +++ b/readme.md @@ -64,7 +64,7 @@ via our [GitHub issue tracker](https://github.com/xwiki-labs/cryptpad/issues/), # Team -CryptPad is actively developped by a team at [XWiki SAS](https://www.xwiki.com), a company developer of Open Source software since 2004 with Open-Source contributors from around the world. It has been funded between 2015-2019 through a research grant from the French state through [BPI France](https://www.bpifrance.fr/). It is currently funded by an 50KEuros NLNet Next-Generation Internet grant, subscribers of CryptPad.fr and our [Open-Collective](https://opencollective.com/cryptpad). +CryptPad is actively developed by a team at [XWiki SAS](https://www.xwiki.com), a company that has been building Open-Source software since 2004 with contributors from around the world. Between 2015 and 2019 it was funded by a research grant from the French state through [BPI France](https://www.bpifrance.fr/). It is currently financed by [NLnet PET](https://nlnet.nl/PET/), subscribers of CryptPad.fr and our donations to our [Open-Collective campaign](https://opencollective.com/cryptpad). # Contributing From e7b65c5fca69cfb1584cb6916e49e1082526daae Mon Sep 17 00:00:00 2001 From: ansuz Date: Tue, 4 Jun 2019 14:20:13 +0200 Subject: [PATCH 3/3] remove duplicated word --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 547ee073a..b6a3d9b17 100644 --- a/readme.md +++ b/readme.md @@ -64,7 +64,7 @@ via our [GitHub issue tracker](https://github.com/xwiki-labs/cryptpad/issues/), # Team -CryptPad is actively developed by a team at [XWiki SAS](https://www.xwiki.com), a company that has been building Open-Source software since 2004 with contributors from around the world. Between 2015 and 2019 it was funded by a research grant from the French state through [BPI France](https://www.bpifrance.fr/). It is currently financed by [NLnet PET](https://nlnet.nl/PET/), subscribers of CryptPad.fr and our donations to our [Open-Collective campaign](https://opencollective.com/cryptpad). +CryptPad is actively developed by a team at [XWiki SAS](https://www.xwiki.com), a company that has been building Open-Source software since 2004 with contributors from around the world. Between 2015 and 2019 it was funded by a research grant from the French state through [BPI France](https://www.bpifrance.fr/). It is currently financed by [NLnet PET](https://nlnet.nl/PET/), subscribers of CryptPad.fr and donations to our [Open-Collective campaign](https://opencollective.com/cryptpad). # Contributing