diff options
| author | lambda <lain@soykaf.club> | 2019-03-13 09:09:44 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-03-13 09:09:44 +0000 |
| commit | 92a0210fb03ca3e0aefe769fb6b0ab7bda6e5336 (patch) | |
| tree | 56e78105e29834c60f73c1bf8c39a983d88421a4 /lib/pleroma/web/common_api/utils.ex | |
| parent | d0e94d5f1baac7a19d6cdd33b1f54470041e7227 (diff) | |
| parent | d43b1c0b5d203fd4f195951ac7b60b666a43914f (diff) | |
| download | pleroma-92a0210fb03ca3e0aefe769fb6b0ab7bda6e5336.tar.gz | |
Merge branch 'features/add-credo-to-ci' into 'develop'
Add credo to CI
See merge request pleroma/pleroma!902
Diffstat (limited to 'lib/pleroma/web/common_api/utils.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index e4b9102c5..b7513ef28 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -6,14 +6,14 @@ defmodule Pleroma.Web.CommonAPI.Utils do alias Calendar.Strftime alias Comeonin.Pbkdf2 alias Pleroma.Activity + alias Pleroma.Config alias Pleroma.Formatter alias Pleroma.Object alias Pleroma.Repo alias Pleroma.User - alias Pleroma.Config + alias Pleroma.Web.ActivityPub.Utils alias Pleroma.Web.Endpoint alias Pleroma.Web.MediaProxy - alias Pleroma.Web.ActivityPub.Utils # This is a hack for twidere. def get_by_id_or_ap_id(id) do |