Ivan Tashkinov 06b3bb54c5 Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/account_controller.ex # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex		2019-10-06 11:43:49 +03:00
..
activity/ir
bbs
config
conversation
daemons
emails
emoji
fixtures	Add test for handling Announces with inlined object from different origin	2019-10-05 13:56:40 +02:00
http
instance_static/emoji
integration
object
plugs	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-02 20:42:40 +03:00
support
tasks
upload
uploaders
web
activity_expiration_test.exs	Require that ephemeral posts live for at least one hour	2019-07-24 14:46:08 +02:00
activity_test.exs
bookmark_test.exs
captcha_test.exs
config_test.exs
conversation_test.exs
emoji_test.exs
filter_test.exs
formatter_test.exs
healthcheck_test.exs
html_test.exs
http_test.exs
job_queue_monitor_test.exs
keys_test.exs
list_test.exs
moderation_log_test.exs
notification_test.exs
object_test.exs
pagination_test.exs
registration_test.exs
repo_test.exs
reverse_proxy_test.exs
scheduled_activity_test.exs
signature_test.exs
test_helper.exs
upload_test.exs
user_info_test.exs
user_invite_token_test.exs
user_search_test.exs
user_test.exs
xml_builder_test.exs