diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-07-13 22:47:47 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-07-13 22:47:47 -0500 |
| commit | deb3f911366925bcc342a4a0deb44a2e7da7f1ba (patch) | |
| tree | c8e587198f64c4c5f991a05561943c6bd0af465b /lib/pleroma/delivery.ex | |
| parent | 5e88796784e0ac2dbf57d9cf954fdc8ae8aeae43 (diff) | |
| parent | 173e977e283789a814278c63bc81f40a13942e21 (diff) | |
| download | pleroma-deb3f911366925bcc342a4a0deb44a2e7da7f1ba.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sort
Diffstat (limited to 'lib/pleroma/delivery.ex')
| -rw-r--r-- | lib/pleroma/delivery.ex | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/pleroma/delivery.ex b/lib/pleroma/delivery.ex index e8d536767..511d5cf58 100644 --- a/lib/pleroma/delivery.ex +++ b/lib/pleroma/delivery.ex @@ -9,7 +9,6 @@ defmodule Pleroma.Delivery do alias Pleroma.Object alias Pleroma.Repo alias Pleroma.User - alias Pleroma.User import Ecto.Changeset import Ecto.Query |