diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-14 11:58:38 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-14 11:58:38 +0300 |
| commit | 650853fc895fb2e21eac347e056eab98b842a3b7 (patch) | |
| tree | 7df844177fb8aa12057c6a0693b2bd04ca17807a /priv/repo/migrations/20190711042021_create_safe_jsonb_set.exs | |
| parent | 99b0bc198921099816a5f809f11a7579b3993274 (diff) | |
| parent | 60cc7d6c9a2ec60c3a98f0fe51d68d3dbd5d21c2 (diff) | |
| download | pleroma-650853fc895fb2e21eac347e056eab98b842a3b7.tar.gz pleroma-650853fc895fb2e21eac347e056eab98b842a3b7.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# lib/pleroma/notification.ex
Diffstat (limited to 'priv/repo/migrations/20190711042021_create_safe_jsonb_set.exs')
| -rw-r--r-- | priv/repo/migrations/20190711042021_create_safe_jsonb_set.exs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/priv/repo/migrations/20190711042021_create_safe_jsonb_set.exs b/priv/repo/migrations/20190711042021_create_safe_jsonb_set.exs index 2f336a5e8..43d616705 100644 --- a/priv/repo/migrations/20190711042021_create_safe_jsonb_set.exs +++ b/priv/repo/migrations/20190711042021_create_safe_jsonb_set.exs @@ -1,6 +1,5 @@ defmodule Pleroma.Repo.Migrations.CreateSafeJsonbSet do use Ecto.Migration - alias Pleroma.User def change do execute(""" |