Resolve merge conflict
authorRin Toshaka <rinpatch@sdf.org>
Sun, 30 Dec 2018 20:00:40 +0000 (21:00 +0100)
committerRin Toshaka <rinpatch@sdf.org>
Sun, 30 Dec 2018 20:00:40 +0000 (21:00 +0100)
commitdec23500d8988c22a99f049ef1d1e49328ba075a
treea6e16c5fa60b02058b1ebd985f20ac8f0f4ffa5b
parentab3089d6a718d4a70b0d702307d41e64e17bc505
parentdfde2622d0c14195392e306fadc7c729c68da273
Resolve merge conflict
lib/pleroma/object.ex
lib/pleroma/user.ex