Egor Kislitsyn 48591aab98 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts ... # Conflicts: # docs/config.md		2019-01-09 16:56:31 +07:00
..
Admin-API.md	Add docs/Admin-API.md	2018-12-31 12:27:46 +01:00
Pleroma-API.md	Add docs/Admin-API.md	2018-12-31 12:27:46 +01:00
config.md	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts	2019-01-09 16:56:31 +07:00