diff options
| author | feld <feld@feld.me> | 2021-06-07 20:06:36 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-06-07 20:06:36 +0000 |
| commit | 84f42b92f0f53c569d0f7628d0a4af3ee5c06eaa (patch) | |
| tree | 80664a6152e92abb37133fede9e3ed72c6801910 /README.md | |
| parent | 4ca380490f1e42ef6b12c4b12ba9efabb89472fd (diff) | |
| parent | 64bc0c69ed6b77283905b04585f03c23cbedbe03 (diff) | |
| download | pleroma-84f42b92f0f53c569d0f7628d0a4af3ee5c06eaa.tar.gz pleroma-84f42b92f0f53c569d0f7628d0a4af3ee5c06eaa.zip | |
Merge branch 'develop' into 'fix/prune-hashtags'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -50,5 +50,5 @@ If you are not developing Pleroma, it is better to use the OTP release, which co - Latest Git revision: <https://docs-develop.pleroma.social> ## Community Channels -* IRC: **#pleroma** and **#pleroma-dev** on freenode, webchat is available at <https://irc.pleroma.social> -* Matrix: <https://matrix.to/#/#freenode_#pleroma:matrix.org> and <https://matrix.to/#/#freenode_#pleroma-dev:matrix.org> +* IRC: **#pleroma** and **#pleroma-dev** on libera.chat, webchat is available at <https://irc.pleroma.social> +* Matrix: [#pleroma:libera.chat](https://matrix.to/#/#pleroma:libera.chat) and [#pleroma-dev:libera.chat](https://matrix.to/#/#pleroma-dev:libera.chat) |