squeegily
/
pleroma
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 42 Wiki Activity
Browse Source

Clean merge crumbs

tags/v1.1.4
Mark Felder 5 years ago
parent
7e930559fe
commit
7222afe01b
1 changed files with 0 additions and 1 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -1
      config/config.exs

+ 0
- 1
config/config.exs View File

@@ -353,7 +353,6 @@ config :pleroma, Pleroma.Web.Federator.RetryQueue,
initial_timeout: 30,
max_retries: 5

<<<<<<< HEAD
config :pleroma_job_queue, :queues,
federator_incoming: 50,
federator_outgoing: 50,


Write Preview
Loading…
Cancel
Save