Ilja 16f0d8ea71 Merge branch 'simplePolicy_reasons_for_instance_specific_policies' of https://git.pleroma.social/ilja/pleroma into simplePolicy_reasons_for_instance_specific_policies		2020-12-13 22:34:44 +01:00
..
mix	Merge branch 'feature/configdb-mix-tasks' into 'develop'	2020-12-07 18:06:06 +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 'simplePolicy_reasons_for_instance_specific_policies' of https://git.pleroma.social/ilja/pleroma into simplePolicy_reasons_for_instance_specific_policies	2020-12-13 22:34:44 +01:00
jason_types.ex	Update Copyrights	2020-03-03 16:44:49 -06:00