diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-02-17 14:07:04 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-02-17 14:07:04 +0300 |
| commit | bc4f77b10bb4360ac00d1999b1d08fa55e1fa547 (patch) | |
| tree | 8c87c2cefd1e325a64a19c04d7d7d70ffd8cc485 /lib/pleroma/web/metadata | |
| parent | dcf24a3233bb50689d26f9d7833f98158730ce35 (diff) | |
| parent | 3b141194715e362d65482672d00b10991d102fa2 (diff) | |
| download | pleroma-bc4f77b10bb4360ac00d1999b1d08fa55e1fa547.tar.gz | |
[#468] Merged `upstream/develop`, resolved conflicts.
Diffstat (limited to 'lib/pleroma/web/metadata')
| -rw-r--r-- | lib/pleroma/web/metadata/opengraph.ex | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/pleroma/web/metadata/opengraph.ex b/lib/pleroma/web/metadata/opengraph.ex index 30333785e..190377767 100644 --- a/lib/pleroma/web/metadata/opengraph.ex +++ b/lib/pleroma/web/metadata/opengraph.ex @@ -3,10 +3,12 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.Metadata.Providers.OpenGraph do - alias Pleroma.Web.Metadata.Providers.Provider + alias Pleroma.HTML + alias Pleroma.Formatter + alias Pleroma.User alias Pleroma.Web.Metadata - alias Pleroma.{HTML, Formatter, User} alias Pleroma.Web.MediaProxy + alias Pleroma.Web.Metadata.Providers.Provider @behaviour Provider |