Merge branch 'feature/polls-2-electric-boogalo' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Mon, 3 Jun 2019 12:19:19 +0000 (12:19 +0000)
committerrinpatch <rinpatch@sdf.org>
Mon, 3 Jun 2019 12:19:19 +0000 (12:19 +0000)
commit9789e000b05621435dc0c03833f564481e0b80e6
treee2625834287cb13a3951c93886ae080ed58c1484
parentd33d248b69c77a7ab712cfe4b727c0000a77f4ea
parentdc91bcc0afc82ddd52a617352e0e4e89e1a1d61c
Merge branch 'feature/polls-2-electric-boogalo' into 'develop'

Polls 2 Electric Boogalo

Closes #657

See merge request pleroma/pleroma!1190