Merge branch 'mr/exsyslogger-doc-and-format' into 'develop'

Adds a couple examples to docs/config.md for ExSyslogger and removes duplicate timestamps from default format.

See merge request pleroma/pleroma!784

diff --git a/lib/pleroma/web/activity_pub/views/user_view.ex b/lib/pleroma/web/activity_pub/views/user_view.ex
index b9588bee59634f6990d1ebf8dccdbf8a44b95de7..1f6b591a5ee911b4a4d8d9a267ce1ec83957f9cb 100644 (file)
--- a/lib/pleroma/web/activity_pub/views/user_view.ex
+++ b/lib/pleroma/web/activity_pub/views/user_view.ex
@@ -239,6 +239,8 @@ defmodule Pleroma.Web.ActivityPub.UserView do
 
     if offset < total do
       Map.put(map, "next", "#{iri}?page=#{page + 1}")
+    else
+      map
     end
   end
 end