minibikini 6163fbf553 Merge branch 'develop' into 'frontend-admin-api' ... # Conflicts: # lib/pleroma/web/router.ex		2020-11-02 10:43:45 +00:00
..
benchmark.exs	web push http_client fix	2020-10-01 13:32:11 +03:00
config.exs	Merge branch 'develop' into 'frontend-admin-api'	2020-11-02 10:43:45 +00:00
description.exs	Merge remote-tracking branch 'origin/develop' into feature/account-export	2020-10-30 19:34:02 +04: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
releases.exs
test.exs	RemoteIp module name	2020-10-13 16:43:50 +03:00