Ivan Tashkinov 256ff09aa8 [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ...

# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/scheduled_activity_worker.ex
#	lib/pleroma/web/federator/retry_queue.ex
#	lib/pleroma/web/oauth/token/clean_worker.ex
#	test/user_test.exs
#	test/web/federator_test.exs

2019-08-22 20:59:58 +03:00

..

config.exs

[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue

2019-08-22 20:59:58 +03:00

dev.exs

Fixes for dynamic configuration

2019-06-20 17:43:57 +00:00

docker.exs

Run mix format

2019-08-03 13:42:57 -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

Fixes for dynamic configuration

2019-06-20 17:43:57 +00:00

releases.exs

Set instance static/uploads to be outside of application directory in release config

2019-06-14 01:42:56 +03:00

test.exs

Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue

2019-08-09 20:09:56 +03:00