Merge branch 'ecto-3-migration' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Thu, 21 Mar 2019 16:24:57 +0000 (16:24 +0000)
committerrinpatch <rinpatch@sdf.org>
Thu, 21 Mar 2019 16:24:57 +0000 (16:24 +0000)
Ecto 3.0.7 (ecto_sql 3.0.5) migration

See merge request pleroma/pleroma!957

1  2 
lib/pleroma/activity.ex
lib/pleroma/user.ex

Simple merge
Simple merge