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
..
config_db_test.exs	fix attemps to merge map	2020-06-16 15:54:22 +03:00
deprecation_warnings_test.exs	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
holder_test.exs	don't save tesla settings into db	2020-07-06 08:48:20 +03:00
loader_test.exs	merging release default config on app start	2020-03-11 16:25:53 +03:00
transfer_task_test.exs	Mogrify args as custom tuples	2020-06-16 15:53:28 +03:00