Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned...
authorEgor Kislitsyn <egor@kislitsyn.com>
Wed, 9 Jan 2019 09:56:31 +0000 (16:56 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Wed, 9 Jan 2019 09:56:31 +0000 (16:56 +0700)
commit48591aab980d92823b51d2363fcd4b64d311739a
tree0bceebfbc8e96c7999683168b62b1e4f88272625
parent0c750bc432a6329be7f0dc15707e46625b11faf3
parent5c5c8508c203886f32b150e7d8c1f7362a4fde0e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts

# Conflicts:
# docs/config.md
docs/config.md
lib/pleroma/user/info.ex