Eugen 48dfdad492 Merge branch 'master' into patch-1

2017-04-04 14:51:42 +02: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

Update amaroq name

2017-03-26 15:45:16 -04:00

FAQ.md

Add wiki contents to docs/ instead

2017-01-21 22:51:02 +01:00

List-of-Mastodon-instances.md

Merge branch 'master' into patch-1

2017-04-04 14:51:42 +02:00

User-guide.md

More consistent typography

2017-04-04 06:58:17 +02:00