diff options
author | lain <lain@soykaf.club> | 2019-05-15 17:47:29 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2019-05-15 17:47:29 +0200 |
commit | f168a1cbdc318ffaa2d8bc9fb561eb3dfdfb89d9 (patch) | |
tree | 3c208baf52e27859491cce07954ac9b1198cbc8f /README.md | |
parent | 786f2c7a849bc4fa2bd4aac18de59ef6b2ed18c5 (diff) | |
parent | 62516be9c462ca206163eaf7822f9ee5c2470453 (diff) | |
download | pleroma-f168a1cbdc318ffaa2d8bc9fb561eb3dfdfb89d9.tar.gz pleroma-f168a1cbdc318ffaa2d8bc9fb561eb3dfdfb89d9.zip |
Merge remote-tracking branch 'origin/develop' into conversations-import
Diffstat (limited to 'README.md')
-rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -12,7 +12,7 @@ For clients it supports both the [GNU Social API with Qvitter extensions](https: - [Client Applications for Pleroma](https://docs-develop.pleroma.social/clients.html) -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>. +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>. ## Installation |