diff options
author | Chocobozzz <me@florianbigard.com> | 2019-02-06 12:26:58 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-02-06 12:26:58 +0100 |
commit | 73471b1a52f242e86364ffb077ea6cadb3b07ae2 (patch) | |
tree | 43dbb7748e281f8d80f15326f489cdea10ec857d /README.md | |
parent | c22419dd265c0c7185bf4197a1cb286eb3d8ebc0 (diff) | |
parent | f5305c04aae14467d6f957b713c5a902275cbb89 (diff) | |
download | PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.tar.gz PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.tar.zst PeerTube-73471b1a52f242e86364ffb077ea6cadb3b07ae2.zip |
Merge branch 'release/v1.2.0'
Diffstat (limited to 'README.md')
-rw-r--r-- | README.md | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -17,6 +17,16 @@ Be part of a network of multiple small federated, interoperable video hosting pr | |||
17 | </p> | 17 | </p> |
18 | 18 | ||
19 | <p align="center"> | 19 | <p align="center"> |
20 | <strong>Developed with ❤ by <a href="https://framasoft.org">Framasoft</a></strong> | ||
21 | </p> | ||
22 | |||
23 | <p align="center"> | ||
24 | <a href="https://framasoft.org"> | ||
25 | <img width="150px" src="http://lutim.cpy.re/Prd3ci7G.png" alt="Framasoft logo"/> | ||
26 | </a> | ||
27 | </p> | ||
28 | |||
29 | <p align="center"> | ||
20 | <strong>Client</strong> | 30 | <strong>Client</strong> |
21 | 31 | ||
22 | <br /> | 32 | <br /> |
@@ -123,7 +133,7 @@ You can also join the cheerful bunch that makes our community: | |||
123 | 133 | ||
124 | * Chat<a name="contact"></a>: | 134 | * Chat<a name="contact"></a>: |
125 | * IRC : **[#peertube on chat.freenode.net:6697](https://kiwiirc.com/client/irc.freenode.net/#peertube)** | 135 | * IRC : **[#peertube on chat.freenode.net:6697](https://kiwiirc.com/client/irc.freenode.net/#peertube)** |
126 | * Matrix (bridged on the IRC channel) : **[#peertube:matrix.org](https://matrix.to/#/#peertube:matrix.org)** | 136 | * Matrix (bridged on IRC and [Discord](https://discord.gg/wj8DDUT)) : **[#peertube:matrix.org](https://matrix.to/#/#peertube:matrix.org)** |
127 | * Forum: | 137 | * Forum: |
128 | * Framacolibri: [https://framacolibri.org/c/peertube](https://framacolibri.org/c/peertube) | 138 | * Framacolibri: [https://framacolibri.org/c/peertube](https://framacolibri.org/c/peertube) |
129 | 139 | ||