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

..

mix/tasks/pleroma

add default configuration for the pinned statuses and some doc

2019-01-08 16:11:03 +07:00

pleroma

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts

2019-01-09 16:56:31 +07:00

jason_types.ex

…

transports.ex

…

xml_builder.ex

…