Eugen 05fe3c3942 Merge branch 'master' into patch-1		2017-04-02 12:33:29 +02:00
..
screenshots/2fa	Add 2-FA instructions for non-technical users (#580)	2017-01-29 19:26:27 +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-02 12:33:29 +02:00