Ivan Tashkinov e4b12494d7 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # mix.lock		2020-05-14 20:19:56 +03:00
..
benchmark.exs
config.exs	[#2497] Added support for :eimp for image resizing.	2020-05-14 20:18:31 +03:00
description.exs	copy/paste fix for descriptions	2020-05-11 09:35:20 +03: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