Ivan Tashkinov 39ce894a07 Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks ... # Conflicts: # lib/pleroma/user.ex		2020-01-10 16:18:32 +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/origin/develop' into 1478-oauth-admin-scopes-tweaks	2020-01-10 16:18:32 +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	Set Logger level to :info in prod	2019-12-09 19:11:54 +07:00
releases.exs	Move runtime configuration from :instance to :modules	2019-12-06 15:04:46 +07:00
test.exs	Merge branch 'develop' into feature/custom-runtime-modules	2019-12-16 22:34:21 +07:00