From: kaniini <nenolod@gmail.com>
Date: Sat, 29 Jun 2019 00:12:09 +0000 (+0000)
Subject: Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=d1549a6375a1c5a4a4915241df266665b7d99360;p=akkoma

Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop'

Merge admin and mastodon user views for reports

See merge request pleroma/pleroma!1346
---

d1549a6375a1c5a4a4915241df266665b7d99360