Haelwenn 28f8fcf8b0 Merge branch 'fix/follow-and-blocks-import' into 'develop' ... Fix follower/blocks import when nicknames starts with @ Closes #1698 See merge request pleroma/pleroma!2416		2020-04-22 15:46:04 +00:00
..
activity_pub	Merge remote-tracking branch 'upstream/develop' into accept-deletes	2020-04-20 10:15:40 -05:00
admin_api	Merge branch 'feature/1584-client-captcha-options' into 'develop'	2020-04-17 09:19:35 +00:00
api_spec
auth	[#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.	2020-04-17 21:21:10 +03:00
common_api	Merge branch 'develop' into features/remove-user-source_data	2020-04-16 21:28:52 +03:00
feed	fix for use of published from different entities	2020-04-16 18:05:36 +03:00
instances
mastodon_api	Merge branch 'bugfix/following-fix-status-code' into 'develop'	2020-04-22 15:33:04 +00:00
media_proxy
metadata
mongooseim
oauth
ostatus
pleroma_api/controllers	Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement	2020-04-15 19:20:34 +03:00
plugs
push	WebPush: Return proper values for jobs.	2020-04-22 13:28:34 +02:00
rich_media
static_fe
streamer	Streamer: Stream boosts to the boosting user.	2020-04-22 17:21:13 +02:00
twitter_api	Fix Oban warning	2020-04-22 19:27:28 +04:00
views
web_finger
chat_channel_test.exs
fallback_test.exs
federator_test.exs	Federator: Return proper values for jobs	2020-04-22 13:28:52 +02:00
masto_fe_controller_test.exs
node_info_test.exs
rel_me_test.exs
uploader_controller_test.exs