Fix merge conflict
authorEgor Kislitsyn <egor@kislitsyn.com>
Wed, 5 Jun 2019 10:55:00 +0000 (17:55 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Wed, 5 Jun 2019 10:55:00 +0000 (17:55 +0700)
commitddd4a09b72ede65345ddf45a68eb239b54eda86c
tree020bf8fa0ba54dd2690d2300c3dae94f3de2622f
parentcfa5572d28a5a7b58d73106c32420b14ffd9fd2a
Fix merge conflict
lib/pleroma/web/common_api/utils.ex