Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned...
authorEgor Kislitsyn <egor@kislitsyn.com>
Tue, 8 Jan 2019 09:32:07 +0000 (16:32 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Tue, 8 Jan 2019 09:32:07 +0000 (16:32 +0700)
commit0c750bc432a6329be7f0dc15707e46625b11faf3
tree36702360119a8bce2d2b41c84d32d0cdd1a48c0c
parent6428ef77adef6aa3fca1fbcdcfffc5db5fc953d5
parent4e5b1560479df7dd553a2132186f9701e1d56871
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
docs/config.md