diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-02-11 13:54:21 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-02-11 13:54:21 +0700 |
| commit | 305d2194136d4560e02c110d528164034d3727b2 (patch) | |
| tree | 40510e1c4dc0140ff16e2fdc483da64c83b7077c /lib/pleroma/instances/instance.ex | |
| parent | 5b1d7c3c5672af065af503891d156b6e0cf5a8c1 (diff) | |
| parent | 06c4935c11fc58f5ede18706bc46dcc502e64052 (diff) | |
| download | pleroma-305d2194136d4560e02c110d528164034d3727b2.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
# Conflicts:
# lib/pleroma/web/federator/federator.ex
# lib/pleroma/web/websub/websub.ex
Diffstat (limited to 'lib/pleroma/instances/instance.ex')
| -rw-r--r-- | lib/pleroma/instances/instance.ex | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/instances/instance.ex b/lib/pleroma/instances/instance.ex index 4a4ca26dd..48bc939dd 100644 --- a/lib/pleroma/instances/instance.ex +++ b/lib/pleroma/instances/instance.ex @@ -2,13 +2,13 @@ defmodule Pleroma.Instances.Instance do @moduledoc "Instance." alias Pleroma.Instances + alias Pleroma.Repo alias Pleroma.Instances.Instance use Ecto.Schema - import Ecto.{Query, Changeset} - - alias Pleroma.Repo + import Ecto.Query + import Ecto.Changeset schema "instances" do field(:host, :string) |