aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Kirkbride <kirkins@gmail.com>2017-03-08 13:12:34 +0000
committerGitHub <noreply@github.com>2017-03-08 13:12:34 +0000
commitdd930a612972516a788e43d8244fcd5b9c86a419 (patch)
treeabf672f2dc6db7a0784dcd75cfd228138500d386
parentMistake in last commit, copy and pasted wrong one (diff)
downloadawesome-selfhosted-dd930a612972516a788e43d8244fcd5b9c86a419.tar.gz
awesome-selfhosted-dd930a612972516a788e43d8244fcd5b9c86a419.zip
replace CCBYSA licenses with a single entry
-rw-r--r--README.md8
1 files changed, 2 insertions, 6 deletions
diff --git a/README.md b/README.md
index 0cdea705..b5ccc9ba 100644
--- a/README.md
+++ b/README.md
@@ -230,7 +230,7 @@ Some [Groupware](#groupware) solutions also feature calendar/address book editin
* [Niltalk](http://niltalk.com/) - A simple, private, persistence-free web based multi-room chat server + client. ([Source Code](https://github.com/knadh/niltalk)) `AGPLv3` `Go`
* [Node-Chat](https://github.com/IgorAntun/node-chat) - A not-so-basic open-source chat with admin features. `MIT` `Nodejs`
* [Pushjet](https://pushjet.io/) - A self hosted push notification service built with a simple API making sending notifications easy. ([Source Code](https://github.com/Pushjet/Pushjet-Server-Api)) `BSD` `Python`
- * [Rallly](http://rallly.co) - Rallly is a free collaborative scheduling service. ([Source Code](https://github.com/lukevella/Rallly)) `CCBYNCv4` `Nodejs`
+ * [Rallly](http://rallly.co) - Rallly is a free collaborative scheduling service. ([Source Code](https://github.com/lukevella/Rallly)) `CCBYSA` `Nodejs`
* [RetroShare](http://retroshare.org) - Secured and decentralized communication system. Offers decentralized chat, forums, messaging, file transfer. ([Source Code](https://github.com/RetroShare/RetroShare)) `GPLv2` `ะก++`
* [Ring](https://ring.cx/) - Free software for universal communication which respects freedoms and privacy of its users. ([Source Code](https://github.com/savoirfairelinux/ring-project)) `GPLv3` `C++`
* [Rocket.Chat](https://rocket.chat/) - Teamchat solution similar to Gitter.im or Slack. ([Source Code](https://github.com/RocketChat/Rocket.Chat)) `MIT` `Nodejs`
@@ -1206,11 +1206,7 @@ See also [Documentation Generators](#documentation-generators), [Wikimatrix](htt
* `Beerware` - [Beerware License](https://spdx.org/licenses/Beerware.html)
* `BSD` - [FreeBSD License](https://www.freebsd.org/copyright/license.html)
* `BSD` - [BSD 2-Clause](https://opensource.org/licenses/BSD-3-Clause) or [BSD 3-Clause](https://opensource.org/licenses/BSD-3-Clause) license
- * `CCBYNCNDv4` - [Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International](https://creativecommons.org/licenses/by-nc-nd/4.0/)
- * `CCBYNCSAv2` - [Creative Commons Attribution-NonCommercial-ShareAlike 2.0](https://creativecommons.org/licenses/by-nc-sa/2.0/)
- * `CCBYNCSAv3` - [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported](https://creativecommons.org/licenses/by-nc-sa/3.0/)
- * `CCBYNCv4` - [Creative Commons Attribution-NonCommercial 4.0 International](https://creativecommons.org/licenses/by-nc/4.0/)
- * `CCBYSAv4` - [Creative Commons Attribution-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-sa/4.0/)
+ * `CCBYSA` - [Creative Commons Attribution-ShareAlike International License](https://creativecommons.org/licenses/by-sa/4.0/)
* `CC0` - [Public Domain](https://creativecommons.org/about/cc0/)
* `CDDL` - [Common Development and Distribution License](https://opensource.org/licenses/CDDL-1.0)
* `CeCILL-B` - [CEA CNRS INRIA Logiciel Libre](http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt)