Merge branch 'andstatus-mastodon' into 'master'

AndStatus now supports Mastodon

See merge request !2283
This commit is contained in:
Boris Kraut 2017-05-30 16:37:19 +00:00
commit 96b7f8bfa4

View file

@ -12,9 +12,10 @@ A low traffic social networking client with tree-like threaded conversations.
It supports multiple protocols, including [http://gnu.io/ GNU social]/StatusNet
(e.g. [http://quitter.se/ Quitter], [https://loadaverage.org/ LoadAverage],
[https://status.vinilox.eu/ Vinilox] etc.), [http://www.twitter.com/ Twitter]
and [http://pump.io Pump.io]. It combines your accounts from all networks into
one timeline and allows you reading and posting even while you are offline.
[https://status.vinilox.eu/ Vinilox] etc.), [http://www.twitter.com/ Twitter],
[https://github.com/tootsuite/mastodon Mastodon] and [http://pump.io Pump.io].
It combines your accounts from all networks into one timeline and allows you
reading and posting even while you are offline.
Differentiating features of AndStatus: