Mark Felder 3462d4b995 Merge branch 'develop' into issue/1855		2020-06-17 12:50:06 -05:00
..
benchmark.exs
config.exs	Merge branch 'develop' into issue/1855	2020-06-17 12:50:06 -05:00
description.exs	Merge branch 'develop' into issue/1855	2020-06-17 12:50:06 -05:00
dev.exs
docker.exs
dokku.exs
emoji.txt
prod.exs
releases.exs
test.exs	Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController	2020-05-07 08:14:54 +00:00