minibikini b57e4ad1ab Merge branch 'develop' into 'openapi/admin/relay' ... # Conflicts: # lib/pleroma/web/admin_api/controllers/admin_api_controller.ex		2020-06-04 13:29:32 +00:00
..
activity_pub	Merge branch 'fix-relay-repeat-notification' into 'develop'	2020-05-29 10:42:49 +00:00
admin_api	Merge branch 'develop' into 'openapi/admin/relay'	2020-06-04 13:29:32 +00: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 filename_display_max_length config	2020-05-22 18:19:25 +03:00
feed	[#1501] Made user feed contain public and unlisted activities.	2020-05-25 23:27:47 +03:00
instances
mastodon_api	Merge branch 'fix/1794-hashtag-search-results' into 'develop'	2020-06-02 16:30:03 +00:00
media_proxy	MediaProxy test: use config macros instead of directly putting values	2020-05-27 19:34:56 +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	OStatusController: Add Mastodon activity compat route.	2020-05-22 17:11:59 +02:00
pleroma_api	Merge branch 'emoji-react-better-errors' into 'develop'	2020-05-22 14:36:08 +00:00
plugs
push	Announcements: Fix all tests.	2020-05-21 13:16:21 +02: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	fix unused var warning	2020-05-29 23:05:03 +03:00
twitter_api	Upgrade Comeonin to v5	2020-05-12 17:14:59 -05:00
views
web_finger	WebFinger Test: Add back test.	2020-05-05 09:55:33 +02:00
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