Merge branch 'admin-changes' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Tue, 30 Jul 2019 16:36:05 +0000 (16:36 +0000)
committerkaniini <ariadne@dereferenced.org>
Tue, 30 Jul 2019 16:36:05 +0000 (16:36 +0000)
commit373a7c673983189539e39679cab50ae7869d2c4c
tree7d7b4a08be3eee62b2b088c0bd20c3931fd0a58b
parent677df5ceb370a22fa8df44e6ce5f6fa47d91f9b8
parent51b3b6d8164de9196159dc7de8d5abf0c4fa1bce
Merge branch 'admin-changes' into 'develop'

Admin changes

See merge request pleroma/pleroma!1489