Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop'
authorkaniini <nenolod@gmail.com>
Sat, 29 Jun 2019 00:12:09 +0000 (00:12 +0000)
committerkaniini <nenolod@gmail.com>
Sat, 29 Jun 2019 00:12:09 +0000 (00:12 +0000)
commitd1549a6375a1c5a4a4915241df266665b7d99360
tree47409c02a5cdeb270126a42f6cd6b113d2ade4c6
parentf375c2fd700d09da8de831b955731acbb604cf79
parent90927e6a9a7b29f3a12335fd8b7ba899dcc0dffd
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