Valentin Ouvrard 3e4eb9c95f Merge branch 'master' into master		2017-04-08 13:39:09 +11:00
..
screenshots
2FA.md	fix extraneous text in 2fa readme (#592)	2017-02-03 00:10:22 +01:00
Apps.md
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-08 13:39:09 +11:00
User-guide.md