From 3e5ff4320a118f684fb751e281081af866bf6944 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 23 Apr 2018 14:50:00 +0200
Subject: [PATCH] Update CREDITS

---
 CREDITS.md                            | 58 ++++++++++++++-------------
 README.md                             |  6 +--
 scripts/generate-code-contributors.sh |  4 +-
 3 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/CREDITS.md b/CREDITS.md
index dd195305a..5f89ee8a2 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -1,33 +1,35 @@
 # Code
 
- * [Chocobozzz](https://github.com/Chocobozzz) 
- * [Green-Star](https://github.com/Green-Star) 
- * [jankeromnes](https://github.com/jankeromnes) 
- * [bnjbvr](https://github.com/bnjbvr) 
- * [DimitriGilbert](https://github.com/DimitriGilbert) 
- * [dadall](https://github.com/dadall) 
- * [dedesite](https://github.com/dedesite) 
- * [lucaspontoexe](https://github.com/lucaspontoexe) 
- * [rigelk](https://github.com/rigelk) 
- * [flyingrub](https://github.com/flyingrub) 
- * [svnet-libre](https://github.com/svnet-libre) 
- * [tcitworld](https://github.com/tcitworld) 
- * [kaiyou](https://github.com/kaiyou) 
- * [taziden](https://github.com/taziden) 
- * [sticmac](https://github.com/sticmac) 
- * [qsypoq](https://github.com/qsypoq) 
- * [DatBewar](https://github.com/DatBewar) 
- * [ReK2Fernandez](https://github.com/ReK2Fernandez) 
- * [fflorent](https://github.com/fflorent) 
- * [faddat](https://github.com/faddat) 
- * [ldidry](https://github.com/ldidry) 
- * [ALSai](https://github.com/ALSai) 
- * [valvin1](https://github.com/valvin1) 
- * [FrozenDroid](https://github.com/FrozenDroid) 
- * [AugierLe42e](https://github.com/AugierLe42e) 
- * [jonathanraes](https://github.com/jonathanraes) 
- * [luzpaz](https://github.com/luzpaz) 
- * [ewasion](https://github.com/ewasion)
+ * [Chocobozzz](https://github.com/Chocobozzz)
+ * [gegeweb](https://github.com/gegeweb)
+ * [rigelk](https://github.com/rigelk)
+ * [bnjbvr](https://github.com/bnjbvr)
+ * [DimitriGilbert](https://github.com/DimitriGilbert)
+ * [Green-Star](https://github.com/Green-Star)
+ * [jankeromnes](https://github.com/jankeromnes)
+ * [Angristan](https://github.com/Angristan)
+ * [okhin](https://github.com/okhin)
+ * [svnet-libre](https://github.com/svnet-libre)
+ * [dedesite](https://github.com/dedesite)
+ * [floSoX](https://github.com/floSoX)
+ * [dadall](https://github.com/dadall)
+ * [jonathanraes](https://github.com/jonathanraes)
+ * [ldidry](https://github.com/ldidry)
+ * [DavidLibeau](https://github.com/DavidLibeau)
+ * [mrflos](https://github.com/mrflos)
+ * [LecygneNoir](https://github.com/LecygneNoir)
+ * [lucaspontoexe](https://github.com/lucaspontoexe)
+ * [flyingrub](https://github.com/flyingrub)
+ * [tcitworld](https://github.com/tcitworld)
+ * [valvin1](https://github.com/valvin1)
+ * [kaiyou](https://github.com/kaiyou)
+ * [taziden](https://github.com/taziden)
+ * [sticmac](https://github.com/sticmac)
+ * [luzpaz](https://github.com/luzpaz)
+ * [qsypoq](https://github.com/qsypoq)
+ * [noplanman](https://github.com/noplanman)
+ * [Nautigsam](https://github.com/Nautigsam)
+ * [ewft](https://github.com/ewft)
 
 # Design
 
diff --git a/README.md b/README.md
index c49d5a27d..566b8f1a9 100644
--- a/README.md
+++ b/README.md
@@ -7,9 +7,9 @@ Federated (ActivityPub) video streaming platform using P2P (BitTorrent)
 directly in the web browser with <a href="https://github.com/feross/webtorrent">WebTorrent</a>.
 </h4>
 
-**PeerTube is sponsored by [Framasoft](https://framatube.org/#en), a non-profit
-that promotes, spreads and develops free culture in general, and free-libre
-software in particular. If you want to support this project, please [consider
+**PeerTube is developed by [Framasoft](https://framatube.org/#en), a non-profit
+that promotes and spreads free culture in general, and free-libre software in
+particular. If you want to support this project, please [consider
 donating to them](https://soutenir.framasoft.org/en/).**
 
 <p align="center">
diff --git a/scripts/generate-code-contributors.sh b/scripts/generate-code-contributors.sh
index 9c2541cc2..2201377ae 100755
--- a/scripts/generate-code-contributors.sh
+++ b/scripts/generate-code-contributors.sh
@@ -3,5 +3,5 @@
 set -eu
 
 curl -s https://api.github.com/repos/chocobozzz/peertube/contributors | \
-  jq -r 'map("\\\n * [" + .login + "](" + .url + ")") | .[]' | \
-  xargs echo | sed 's/api.github.com\/users/github.com/g'
+  jq -r 'map(" * [" + .login + "](" + .url + ")") | .[]' | \
+  sed 's/api.github.com\/users/github.com/g'