Ilja 0411bdc748 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into simplePolicy_reasons_for_instance_specific_policies ... Conflicts: lib/pleroma/config/deprecation_warnings.ex It looks like `:ok <- mrf_user_allowlist(),` was removed and this created conflicts		2020-09-25 23:47:08 +02:00
..
mix	Simplify the value comparison	2020-09-25 10:37:59 -05:00
pleroma	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into simplePolicy_reasons_for_instance_specific_policies	2020-09-25 23:47:08 +02:00
jason_types.ex
transports.ex
xml_builder.ex