Merge branch 'develop' into gun
authorAlexander Strizhakov <alex.strizhakov@gmail.com>
Sat, 29 Feb 2020 08:34:50 +0000 (11:34 +0300)
committerAlexander Strizhakov <alex.strizhakov@gmail.com>
Sat, 29 Feb 2020 08:34:50 +0000 (11:34 +0300)
commit814b275af7748df6bd11dfc6be1b4efce8d5ae70
treee18b30dfa6eb020e593dbe1cc0e649da3e6ed394
parent6b012ddd69aec0f85c22ad91dbb76e05f2edaf58
parentaad057a2d6baaa342f47f55d330f0731277dac06
Merge branch 'develop' into gun
CHANGELOG.md
config/config.exs
config/description.exs
docs/API/admin_api.md
lib/mix/tasks/pleroma/emoji.ex
lib/pleroma/object/fetcher.ex
test/web/admin_api/admin_api_controller_test.exs
test/web/push/impl_test.exs