From: rinpatch <rinpatch@sdf.org>
Date: Mon, 3 Jun 2019 12:19:19 +0000 (+0000)
Subject: Merge branch 'feature/polls-2-electric-boogalo' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=9789e000b05621435dc0c03833f564481e0b80e6;hp=9789e000b05621435dc0c03833f564481e0b80e6;p=akkoma

Merge branch 'feature/polls-2-electric-boogalo' into 'develop'

Polls 2 Electric Boogalo

Closes #657

See merge request pleroma/pleroma!1190
---