lain 96f7b1b140 Merge branch 'show-media-endpoint-fixes' into 'develop' ... MediaController OAuth scope assignments fix See merge request pleroma/pleroma!2541		2020-05-18 10:57:59 +00:00
..
activity_pub	Add OpenAPI spec for PleromaAPI.AccountController	2020-05-13 19:06:46 +04:00
admin_api	returning partial chain	2020-05-15 16:16:02 +03:00
api_spec	…
auth	Pleroma Authenticator: Also update passwords here.	2020-05-17 11:53:17 +02:00
common_api	CommonAPI: Unblock a user even if we don't have an activity.	2020-05-16 12:28:24 +02:00
feed	Merge branch 'fix/1742-random-failing-tests' into 'develop'	2020-05-13 13:38:32 +00:00
instances	…
mastodon_api	Merge branch 'show-media-endpoint-fixes' into 'develop'	2020-05-18 10:57:59 +00:00
media_proxy	…
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/controllers	Add OpenAPI spec for PleromaAPI.AccountController	2020-05-13 19:06:46 +04: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	…