Ivan Tashkinov 8f88a90ca3 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # lib/pleroma/application.ex # lib/pleroma/config.ex		2021-02-23 13:58:35 +03:00
..
benchmark.exs	web push http_client fix	2020-10-01 13:32:11 +03:00
config.exs	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	2021-02-23 13:58:35 +03:00
description.exs	[#3213] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.	2021-02-23 13:52:28 +03: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	Load an emoji.txt specific to the test env	2021-02-03 16:40:59 -06:00
prod.exs
test.exs	Merge branch 'deprecate-public_endpoint' into 'develop'	2021-01-20 22:48:48 +00:00