feld 93df0796f0 Merge branch 'feature/matstodon-statuses-by-name' into 'develop' ... Feature/matstodon statuses by name See merge request pleroma/pleroma!1211		2019-07-19 21:59:18 +00:00
..
admin
api	Merge branch 'develop' into feature/matstodon-statuses-by-name	2019-07-19 16:55:10 -05:00
config	Merge branch 'feature/richmedia-ttl' into 'develop'	2019-07-19 21:36:36 +00:00
installation	Update otp_en.md - Added creation of initial admin user	2019-07-17 22:35:16 +00:00
clients.md	Fix domain for the contact clients.md	2019-07-19 08:40:47 +00:00
config.md
introduction.md