Ivan Tashkinov bdf57b8ef4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # config/config.exs # lib/pleroma/web/media_proxy/media_proxy.ex # mix.lock # test/web/media_proxy/media_proxy_test.exs		2020-07-19 20:05:37 +03:00
..
activity_pub	Merge branch 'features/mrf-reasons' into 'develop'	2020-07-15 14:00:22 +00:00
admin_api	[#1940] Added admin_token param (as admin_api_params/0) to existing Admin API OpenAPI operations.	2020-07-14 19:31:05 +03:00
api_spec
auth
common_api	ActivityPub: Remove follow and fix issues.	2020-07-08 17:07:24 +02:00
feed
instances
mastodon_api	OpenAPI: Add :id to follower/following endpoints, fixes #1958	2020-07-17 12:35:28 -05:00
media_proxy	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	2020-07-19 20:05:37 +03:00
metadata
mongooseim
oauth
ostatus
pleroma_api	AccountController: Remove unused update_? routes.	2020-07-07 16:53:20 +02:00
plugs
preload	Preloaders: Remove status_net preloader	2020-07-06 12:24:45 +02:00
push	Lint	2020-06-26 14:35:04 -05:00
rich_media	Fix tests	2020-06-15 16:20:05 +04:00
static_fe	StaticFE: Prioritize json in requests.	2020-06-26 16:27:39 +02:00
streamer	Streamer: Don't filter out announce notifications.	2020-07-04 17:11:37 +02:00
twitter_api	Merge branch 'develop' into refactor/notification_settings	2020-07-13 13:32:21 -05:00
views
web_finger
chat_channel_test.exs
fallback_test.exs
federator_test.exs	moving mrf settings from instance to separate group	2020-06-16 18:32:18 +03:00
masto_fe_controller_test.exs	Rename user.settings column	2020-06-30 11:50:53 -05:00
node_info_test.exs	Nodeinfo: Add chat information back in.	2020-06-26 13:04:15 +02:00
rel_me_test.exs
uploader_controller_test.exs