Merge branch 'next-minor' into develop

2017-05-21 12:07:14 +02:00 · 2017-05-21 12:07:14 +02:00 · 7c37a62593
commit 7c37a62593
parent 1e06fd786c 65e8fc4012
1 changed files with 1 additions and 1 deletions
--- a/config/diaspora.yml.example
+++ b/config/diaspora.yml.example
@ -82,7 +82,7 @@ configuration: ## Section
      ## Number of times a job is retried (default=10).
      ## There's an exponential effect to this: if you set this too high you
      ## might get too many jobs building up in the queue.
-      ## Set it to false to disable it completely.
+      ## Set it to 0 to disable it completely.
      #retry: 10

      ## Lines of backtrace that are stored on failure (default=15).