feld 79a509ee61 Merge branch '2301-users-search-discoverability-fix' into 'develop' ... [#2301] Proper handling of User.is_discoverable Closes #2301 See merge request pleroma/pleroma!3162		2020-11-19 20:33:52 +00:00
..
mix	Merge branch 'fix/mix-task-user-delete_activities' into 'develop'	2020-11-18 18:57:47 +00:00
phoenix/transports/web_socket	Merge branch 'develop' into chore/elixir-1.11	2020-10-13 09:54:53 -05:00
pleroma	Merge branch '2301-users-search-discoverability-fix' into 'develop'	2020-11-19 20:33:52 +00:00
jason_types.ex	Update Copyrights	2020-03-03 16:44:49 -06:00