diff options
| author | Sean King <seanking2919@protonmail.com> | 2021-06-04 14:42:44 -0600 |
|---|---|---|
| committer | Sean King <seanking2919@protonmail.com> | 2021-06-04 14:42:44 -0600 |
| commit | dc4814f0cdc12a552001e5e22c979060e4f3f865 (patch) | |
| tree | 38f8cb1729338768da447a27ae243c27d301c7bd /README.md | |
| parent | 2de41770d04cf07ed8775a307b6d457a4750e265 (diff) | |
| parent | 0c56f9de0d607b88fd107e0bd13ef286f0629346 (diff) | |
| download | pleroma-dc4814f0cdc12a552001e5e22c979060e4f3f865.tar.gz pleroma-dc4814f0cdc12a552001e5e22c979060e4f3f865.zip | |
Fix merge conflicts with upstream
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) |