Ivan Tashkinov 6fd4f58ead Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy		2020-05-20 20:27:03 +03:00
..
activity_pub	Merge branch 'feature/1734-user-deletion' into 'develop'	2020-05-20 11:43:49 +00:00
admin_api	returning partial chain	2020-05-15 16:16:02 +03:00
api_spec	Add OpenAPI spec for PleromaAPI.EmojiAPIController	2020-05-18 19:28:46 +04:00
auth	copyright update	2020-05-18 15:15:51 +03:00
common_api	Add OpenAPI spec for PleromaAPI.ScrobbleController	2020-05-19 16:26:06 +04:00
feed	Merge branch 'fix/1742-random-failing-tests' into 'develop'	2020-05-13 13:38:32 +00:00
instances
mastodon_api	Merge branch 'exposed-background-image' into 'develop'	2020-05-20 10:53:54 +00:00
media_proxy	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	2020-05-20 20:27:03 +03:00
metadata	Add OpenAPI spec for StatusController	2020-05-13 00:25:21 +04:00
mongooseim	Upgrade Comeonin to v5	2020-05-12 17:14:59 -05:00
oauth	Upgrade Comeonin to v5	2020-05-12 17:14:59 -05:00
ostatus
pleroma_api	Merge branch 'openapi/pleroma-api/emojis' into 'develop'	2020-05-20 12:08:28 +00:00
plugs
push	Merge branch 'fix/1742-random-failing-tests' into 'develop'	2020-05-13 13:38:32 +00:00
rich_media	Add OpenAPI spec for StatusController	2020-05-13 00:25:21 +04:00
static_fe	Add OpenAPI spec for StatusController	2020-05-13 00:25:21 +04:00
streamer	Add OpenAPI spec for StatusController	2020-05-13 00:25:21 +04:00
twitter_api	Upgrade Comeonin to v5	2020-05-12 17:14:59 -05:00
views
web_finger
chat_channel_test.exs
fallback_test.exs
federator_test.exs	Add OpenAPI spec for StatusController	2020-05-13 00:25:21 +04:00
masto_fe_controller_test.exs
node_info_test.exs
rel_me_test.exs	don't use async with global mocks	2020-05-13 11:38:23 +03:00
uploader_controller_test.exs