aboutsummaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2019-02-17 14:07:04 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2019-02-17 14:07:04 +0300
commitbc4f77b10bb4360ac00d1999b1d08fa55e1fa547 (patch)
tree8c87c2cefd1e325a64a19c04d7d7d70ffd8cc485 /README.md
parentdcf24a3233bb50689d26f9d7833f98158730ce35 (diff)
parent3b141194715e362d65482672d00b10991d102fa2 (diff)
downloadpleroma-bc4f77b10bb4360ac00d1999b1d08fa55e1fa547.tar.gz
[#468] Merged `upstream/develop`, resolved conflicts.
Diffstat (limited to 'README.md')
-rw-r--r--README.md15
1 files changed, 1 insertions, 14 deletions
diff --git a/README.md b/README.md
index d39731ef4..4f22445d0 100644
--- a/README.md
+++ b/README.md
@@ -8,20 +8,7 @@ Pleroma is written in Elixir, high-performance and can run on small devices like
For clients it supports both the [GNU Social API with Qvitter extensions](https://twitter-api.readthedocs.io/en/latest/index.html) and the [Mastodon client API](https://github.com/tootsuite/documentation/blob/master/Using-the-API/API.md).
-Client applications that are committed to supporting Pleroma:
-
-* Mastalab (Android, Streaming Ready)
-* nekonium (Android, Streaming Ready)
-* Tusky (Android, No Streaming)
-* Twidere (Android, No Streaming)
-* Mast (iOS, Paid)
-* Amaroq (iOS, No Streaming)
-
-Client applications that are known to work well:
-
-* Tootdon (Android + iOS, No Streaming)
-* Tootle (iOS, No Streaming)
-* Whalebird (Windows + Mac + Linux)
+- [Client Applications for Pleroma](docs/Clients.md)
No release has been made yet, but several servers have been online for months already. If you want to run your own server, feel free to contact us at @lain@pleroma.soykaf.com or in our dev chat at #pleroma on freenode or via matrix at <https://matrix.heldscal.la/#/room/#freenode_#pleroma:matrix.org>.