changes after rebase
authorAlexander Strizhakov <alex.strizhakov@gmail.com>
Tue, 13 Oct 2020 14:10:34 +0000 (17:10 +0300)
committerAlexander Strizhakov <alex.strizhakov@gmail.com>
Tue, 13 Oct 2020 14:10:34 +0000 (17:10 +0300)
commit4c4ea9a3486f824cfba825a176439d50ec54fe95
tree992e96bbdf4b40a5738ca2306ba3acf4158b17d5
parent3cb9c88837f3105363c5a615724b6363ee926d35
changes after rebase
12 files changed:
docs/configuration/cheatsheet.md
lib/pleroma/web/pleroma_api/controllers/emoji_file_controller.ex
lib/pleroma/web/pleroma_api/controllers/user_import_controller.ex
lib/pleroma/web/streamer.ex
test/pleroma/config/deprecation_warnings_test.exs
test/pleroma/emoji/pack_test.exs [moved from test/emoji/pack_test.exs with 100% similarity]
test/pleroma/user/import_test.exs [moved from test/user/import_test.exs with 100% similarity]
test/pleroma/user/query_test.exs [moved from test/user/query_test.exs with 100% similarity]
test/pleroma/utils_test.exs [moved from test/utils_test.exs with 100% similarity]
test/pleroma/web/pleroma_api/controllers/emoji_file_controller_test.exs [moved from test/web/pleroma_api/controllers/emoji_file_controller_test.exs with 100% similarity]
test/pleroma/web/pleroma_api/controllers/user_import_controller_test.exs [moved from test/web/pleroma_api/controllers/user_import_controller_test.exs with 100% similarity]
test/pleroma/web/rich_media/helpers_test.exs