Merge branch 'develop' into feature/polls-2-electric-boogalo
authorrinpatch <rinpatch@sdf.org>
Mon, 3 Jun 2019 10:16:17 +0000 (13:16 +0300)
committerrinpatch <rinpatch@sdf.org>
Mon, 3 Jun 2019 10:16:17 +0000 (13:16 +0300)
commitdc91bcc0afc82ddd52a617352e0e4e89e1a1d61c
treee2625834287cb13a3951c93886ae080ed58c1484
parent026b245dbc2900d90a737f024b87453bf552b62b
parentd33d248b69c77a7ab712cfe4b727c0000a77f4ea
Merge branch 'develop' into feature/polls-2-electric-boogalo
test/web/mastodon_api/mastodon_api_controller_test.exs