Ivan Tashkinov 8cc809e44e Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # lib/pleroma/notification.ex		2019-10-23 17:22:42 +03:00
..
activity/ir	…
bbs	…
config	…
conversation	[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation	2019-10-20 22:29:56 +03:00
daemons	…
emails	…
emoji	…
fixtures	rework to use properties instead of compound typing, per SocialCG	2019-10-19 23:21:37 +00:00
http	…
instance_static/emoji	…
integration	…
object	…
plugs	…
support	Merge branch 'develop' into feature/masto_api_markers	2019-10-21 11:32:28 +03:00
tasks	…
upload	…
uploaders	…
web	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-23 17:22:42 +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	…
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	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-20 20:43:18 +03:00
notification_test.exs	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-23 17:22:42 +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	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-20 20:43:18 +03:00
test_helper.exs	…
upload_test.exs	…
user_invite_token_test.exs	…
user_search_test.exs	…
user_test.exs	[#1304] Merged `develop`, handled User.Info.invisible.	2019-10-21 11:58:22 +03:00
xml_builder_test.exs	…