Ivan Tashkinov 30caf3e51e Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ...

# Conflicts:
#	lib/pleroma/user.ex

2019-12-04 18:56:31 +03:00

..

activity/ir

…

bbs

Add license/copyright to all project files

2019-07-10 05:13:23 +00:00

config

…

conversation

…

daemons

…

emails

…

emoji

…

federation

…

fixtures

…

http

…

instance_static/emoji

…

integration

…

object

…

plugs

…

support

Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations

2019-12-04 18:56:31 +03:00

tasks

…

upload

…

uploaders

…

web

Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations

2019-12-04 18:56:31 +03:00

activity_expiration_test.exs

…

activity_test.exs

…

bookmark_test.exs

…

captcha_test.exs

…

config_test.exs

…

conversation_test.exs

…

emoji_test.exs

…

filter_test.exs

…

following_relationship_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

…

marker_test.exs

…

moderation_log_test.exs

…

notification_test.exs

Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations

2019-12-04 18:56:31 +03:00

object_test.exs

…

pagination_test.exs

…

registration_test.exs

…

repo_test.exs

…

reverse_proxy_test.exs

…

safe_jsonb_set_test.exs

…

scheduled_activity_test.exs

…

signature_test.exs

…

test_helper.exs

…

upload_test.exs

…

user_invite_token_test.exs

…

user_relationship_test.exs

…

user_search_test.exs

…

user_test.exs

Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations

2019-12-04 18:56:31 +03:00

xml_builder_test.exs

…