Sean King dc4814f0cd Fix merge conflicts with upstream		2021-06-04 14:42:44 -06:00
..
activity_pub	Merge branch 'cycles-base-url' into 'develop'	2021-06-01 16:15:27 +00:00
admin_api	Rename the non-federating Chat feature to Shout	2021-06-01 11:49:14 -05:00
api_spec
auth
common_api	Merge remote-tracking branch 'upstream/develop' into earmark	2021-04-30 13:17:03 -05:00
endpoint
feed	Deprecate Pleroma.Web.base_url/0	2021-05-31 16:48:03 -05:00
mastodon_api	Fix merge conflicts with upstream	2021-06-04 14:42:44 -06:00
media_proxy
metadata
o_auth	Return token's primary key with POST /oauth/token	2021-03-24 12:50:05 -05:00
o_status	Deprecate Pleroma.Web.base_url/0	2021-05-31 16:48:03 -05:00
pleroma_api	OpenAPI: PleromaAPI UserImport Controller	2021-03-15 06:47:07 +01:00
plugs	Fix merge conflicts with upstream	2021-06-04 14:42:44 -06:00
preload/providers
push
rich_media
static_fe	Pipeline Ingestion: Note	2021-04-05 19:19:11 +02:00
twitter_api	Merge branch 'tests/openapi-everywhere' into 'develop'	2021-06-04 18:53:09 +00:00
views
web_finger	Deprecate Pleroma.Web.base_url/0	2021-05-31 16:48:03 -05:00
common_api_test.exs	Merge branch 'cycles-base-url' into 'develop'	2021-06-01 16:15:27 +00:00
fallback_test.exs
federator_test.exs	Pipeline Ingestion: Note	2021-04-05 19:19:11 +02:00
media_proxy_test.exs	Merge remote-tracking branch 'pleroma/develop' into cycles-base-url	2021-05-31 16:49:46 -05:00
mongoose_im_controller_test.exs
node_info_test.exs
rel_me_test.exs
shout_channel_test.ex	We want clear_config/2 in all tests now	2021-06-01 11:49:47 -05:00
streamer_test.exs	not used mock	2021-02-10 18:44:49 +03:00
uploader_controller_test.exs
web_finger_test.exs	Merge remote-tracking branch 'pleroma/develop' into cycles-base-url	2021-05-31 16:49:46 -05:00