Mark Felder 26f710b9e3 Merge branch 'develop' into preload-data		2020-06-12 16:52:52 -05:00
..
benchmark.exs
config.exs	Merge branch 'develop' into preload-data	2020-06-12 16:52:52 -05:00
description.exs	Apply suggestion to config/description.exs	2020-06-12 14:03:33 +00: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