Merge branch 'develop' into refactor/deactivated_user_field

2021-01-25 09:45:06 -06:00 · 2021-01-25 09:45:06 -06:00 · 537ba1c5e0
commit 537ba1c5e0
parent 28581e03ad 0a6f5f4793
48 changed files with 1066 additions and 214 deletions
--- a/lib/mix/pleroma.ex
+++ b/lib/mix/pleroma.ex
@ -13,7 +13,8 @@ defmodule Mix.Pleroma do
    :flake_id,
    :swoosh,
    :timex,
-    :fast_html
+    :fast_html,
+    :oban
  ]
  @cachex_children ["object", "user", "scrubber", "web_resp"]
  @doc "Common functions to be reused in mix tasks"