diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-01-29 08:42:12 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-01-29 08:42:12 +0100 |
| commit | d4520481271087aa284913ff6c198a93c0b37c49 (patch) | |
| tree | 25e4a2ca64f21d9d047ac7d147f7e781b1cdb80e /README.md | |
| parent | 185a4abd23ba07ee252655574506755c0425c540 (diff) | |
| parent | 2c0070c8f31e6a28b1d52ee6e9965e21471abd5b (diff) | |
| download | PeerTube-d4520481271087aa284913ff6c198a93c0b37c49.tar.gz PeerTube-d4520481271087aa284913ff6c198a93c0b37c49.tar.zst PeerTube-d4520481271087aa284913ff6c198a93c0b37c49.zip | |
Merge branch 'develop' into release/v1.2.0
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -133,7 +133,7 @@ You can also join the cheerful bunch that makes our community: | |||
| 133 | 133 | ||
| 134 | * Chat<a name="contact"></a>: | 134 | * Chat<a name="contact"></a>: |
| 135 | * 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)** |
| 136 | * 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)** |
| 137 | * Forum: | 137 | * Forum: |
| 138 | * Framacolibri: [https://framacolibri.org/c/peertube](https://framacolibri.org/c/peertube) | 138 | * Framacolibri: [https://framacolibri.org/c/peertube](https://framacolibri.org/c/peertube) |
| 139 | 139 | ||