Alex Gleason 52fc59f125 Merge remote-tracking branch 'upstream/develop' into earmark		2021-04-30 13:17:03 -05:00
..
config	Load an emoji.txt specific to the test env	2021-02-03 16:40:59 -06:00
credo/check/consistency	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
fixtures	Merge branch 'feature/521-pinned-post-federation' into 'develop'	2021-04-16 09:53:47 +00:00
instance_static
mix	migrating config to tmp folder	2021-03-23 14:29:02 +03:00
pleroma	Merge remote-tracking branch 'upstream/develop' into earmark	2021-04-30 13:17:03 -05:00
support	removeing corresponding add activity	2021-03-25 13:03:41 +03:00
test_helper.exs	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00