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
..
info.ex	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts	2019-01-09 16:56:31 +07:00