feld 48f7e12e6c Merge branch 'ostatus-controller-no-auth-check-on-non-federating-instances' into 'develop' ... OStatus / Static FE access control fixes See merge request pleroma/pleroma!3053		2020-11-05 16:23:56 +03:00
..
mix	Merge branch 'develop' into refactor/locked_user_field	2020-10-13 09:54:29 -05:00
phoenix/transports/web_socket	Merge branch 'chore/elixir-1.11' into 'develop'	2020-11-04 17:05:21 +03:00
pleroma	Merge branch 'ostatus-controller-no-auth-check-on-non-federating-instances' into 'develop'	2020-11-05 16:23:56 +03:00
jason_types.ex	Update Copyrights	2020-03-03 16:44:49 -06:00