diff options
author | rinpatch <rinpatch@sdf.org> | 2019-07-20 22:04:47 +0300 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2019-07-20 22:04:47 +0300 |
commit | 196cad46f35a63c18d58cd5d982bc4e1f9b0d7c3 (patch) | |
tree | 51fa0436998541c3bcc1885eaa2188d7dbb7d469 /docs/clients.md | |
parent | c3ecaea64dd377b586e3b2a5316e90884ec78fe6 (diff) | |
parent | fe548f322e834c7c81678a460c54c71f1198021c (diff) | |
download | pleroma-196cad46f35a63c18d58cd5d982bc4e1f9b0d7c3.tar.gz |
Resolve merge conflicts
Diffstat (limited to 'docs/clients.md')
-rw-r--r-- | docs/clients.md | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/clients.md b/docs/clients.md index 30358c210..9029361f8 100644 --- a/docs/clients.md +++ b/docs/clients.md @@ -31,10 +31,11 @@ Feel free to contact us to be added to this list! - Features: No Streaming ### Fedilab -- Source Code: <https://gitlab.com/tom79/mastalab/> -- Contact: [@tom79@mastodon.social](https://mastodon.social/users/tom79) +- Homepage: <https://fedilab.app/> +- Source Code: <https://framagit.org/tom79/fedilab/> +- Contact: [@fedilab@framapiaf.org](https://framapiaf.org/users/fedilab) - Platforms: Android -- Features: Streaming Ready +- Features: Streaming Ready, Moderation, Text Formatting ### Nekonium - Homepage: [F-Droid Repository](https://repo.gdgd.jp.net/), [Google Play](https://play.google.com/store/apps/details?id=com.apps.nekonium), [Amazon](https://www.amazon.co.jp/dp/B076FXPRBC/) |