Merge branch 'develop' into issue/1383
authorMaksim Pechnikov <parallel588@gmail.com>
Sat, 14 Dec 2019 18:44:10 +0000 (21:44 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Sat, 14 Dec 2019 18:44:10 +0000 (21:44 +0300)
commit67cb46e15dd5fa16da257a9b0e5166266d10c694
tree6801ecba06ea3aac7086c57834e1413e5bb0c84a
parent2b821036c4bd84cee51c9fcace5a4b3764c3bba1
parent8efacfed677ea2f06ac228294faec77a38060976
Merge branch 'develop' into issue/1383
config/config.exs
config/description.exs
config/test.exs
docs/configuration/cheatsheet.md
lib/pleroma/web/mastodon_api/controllers/status_controller.ex
mix.exs
mix.lock