diff options
| author | m4sk1n <me@m4sk.in> | 2017-07-26 13:47:41 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-07-26 13:47:41 +0200 |
| commit | 7905739c2a2bd1df0e128a4f9867704c4f2d0262 (patch) | |
| tree | 35bc80ac985036236fe29ca710d631a6a6c89369 /README.md | |
| parent | 6a6a62f13fd7846ba032543635580980b74ea14c (diff) | |
s/PubSubHubbub/WebSub/g (#4372)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/README.md b/README.md index dd7c519a8..13e580e3f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Mastodon is a free, open-source social network server. A decentralized solution to commercial platforms, it avoids the risks of a single company monopolizing your communication. Anyone can run Mastodon and participate in the social network seamlessly. -An alternative implementation of the GNU social project. Based on [ActivityStreams](https://en.wikipedia.org/wiki/Activity_Streams_(format)), [Webfinger](https://en.wikipedia.org/wiki/WebFinger), [PubsubHubbub](https://en.wikipedia.org/wiki/PubSubHubbub) and [Salmon](https://en.wikipedia.org/wiki/Salmon_(protocol)). +An alternative implementation of the GNU social project. Based on [ActivityStreams](https://en.wikipedia.org/wiki/Activity_Streams_(format)), [Webfinger](https://en.wikipedia.org/wiki/WebFinger), [WebSub](https://en.wikipedia.org/wiki/WebSub) and [Salmon](https://en.wikipedia.org/wiki/Salmon_(protocol)). Click on the screenshot to watch a demo of the UI: @@ -34,7 +34,7 @@ If you would like, you can [support the development of this project on Patreon][ ## Features - **Fully interoperable with GNU social and any OStatus platform** - Whatever implements Atom feeds, ActivityStreams, Salmon, PubSubHubbub and Webfinger is part of the network + Whatever implements Atom feeds, ActivityStreams, Salmon, WebSub and Webfinger is part of the network - **Real-time timeline updates** See the updates of people you're following appear in real-time in the UI via WebSockets - **Federated thread resolving** |