Ivan Tashkinov 835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes ... # Conflicts: # CHANGELOG.md		2019-12-10 08:55:14 +03:00
..
benchmark.exs	Benchmark config: Don't use the sql sandbox.	2019-10-10 15:42:54 +02:00
config.exs	Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes	2019-12-10 08:55:14 +03:00
description.exs	[#1427] Reworked admin scopes support.	2019-12-06 00:25:44 +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	Default log level for syslog in prod should also be :warn	2019-11-26 05:46:48 -06:00
releases.exs	Revert "Merge branch 'patch-1' into 'develop'"	2019-11-21 15:03:27 +00:00
test.exs	Some tasks try to set log level in test environment, but we were stripping logs belog :warn.	2019-11-20 11:55:30 -06:00