Shel R 1b42f717f2 Merge branch 'master' into master

2017-04-07 22:15:55 -04:00

..

screenshots

Update images to standard sizes. Write up Federated/Local timelines and rename relevant image.

2017-04-02 22:31:43 +01:00

2FA.md

fix extraneous text in 2fa readme (#592)

2017-02-03 00:10:22 +01:00

Apps.md

Add HackerNewsBot

2017-04-07 15:56:02 -07:00

FAQ.md

Update Finnish translations, add sample Minio config (#954)

2017-04-07 12:58:12 +02:00

List-of-Mastodon-instances.md

Merge branch 'master' into master

2017-04-07 22:15:55 -04:00

User-guide.md

Correct innacurate info and other fixes

2017-04-05 10:58:41 -04:00