Ivan Tashkinov bdf57b8ef4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy ... # Conflicts: # config/config.exs # lib/pleroma/web/media_proxy/media_proxy.ex # mix.lock # test/web/media_proxy/media_proxy_test.exs		2020-07-19 20:05:37 +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-19 20:05:37 +03:00
description.exs	Add documentation for new connection pool settings and remove some	2020-07-15 15:26:35 +03:00
dev.exs	Enable strict validation mode in dev and test environments	2020-05-04 22:35:28 +04:00
docker.exs	Remove dynamic config as default, add healthcheck	2019-09-03 09:31:52 -04:00
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	MediaProxy whitelist setting now supports hosts with scheme	2020-07-12 12:41:40 +03:00