Ivan Tashkinov 61180ab6f4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # config/config.exs # lib/pleroma/web/media_proxy/media_proxy.ex # lib/pleroma/web/media_proxy/media_proxy_controller.ex		2020-07-02 16:36:54 +03:00
..
benchmark.exs	activities generation tasks	2020-03-30 11:42:25 +03:00
config.exs	Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy	2020-07-02 16:36:54 +03:00
description.exs	Merge branch 'feature/update-description' into 'develop'	2020-07-02 08:43:32 +00:00
dev.exs	Enable strict validation mode in dev and test environments	2020-05-04 22:35:28 +04:00
docker.exs
dokku.exs
emoji.txt
prod.exs	Set Logger level to :info in prod	2019-12-09 19:11:54 +07:00
releases.exs	some refactor and tests	2020-01-21 18:42:00 +03:00
test.exs	Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController	2020-05-07 08:14:54 +00:00