Ivan Tashkinov 0c65a8c3d0 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation ... # Conflicts: # config/config.exs		2020-02-20 15:00:48 +03:00
..
benchmark.exs	Instead allow a dedicated benchmark config	2019-12-19 12:16:53 -06:00
config.exs	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation	2020-02-20 15:00:48 +03:00
description.exs	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation	2020-02-20 15:00:48 +03:00
dev.exs	Fixes for dynamic configuration	2019-06-20 17:43:57 +00:00
docker.exs	Remove dynamic config as default, add healthcheck	2019-09-03 09:31:52 -04:00
dokku.exs	CI: Add auto-deployment via dokku.	2019-05-31 10:55:35 +02:00
emoji.txt	Remove longfox emoji set	2019-08-04 04:32:45 +00:00
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	Merge branch 'feature/new-registrations-digest' into 'develop'	2020-02-20 11:58:37 +00:00