Merge branch 'develop' into feature/788-separate-email-addresses
authorAlex S <alex.strizhakov@gmail.com>
Wed, 10 Apr 2019 11:06:54 +0000 (18:06 +0700)
committerAlex S <alex.strizhakov@gmail.com>
Wed, 10 Apr 2019 11:06:54 +0000 (18:06 +0700)
commitfe511a6c653f24f95dd3bed5941724e3d0155f3a
tree097971af07615b9965329d595d9cb00c7ef2d5f8
parentfe13a1d78c13fbe7b3027d442a6f6906440e5acc
parente5d553aa45ffa218b0695d7976f012bfc1dcbafe
Merge branch 'develop' into feature/788-separate-email-addresses
test/web/admin_api/admin_api_controller_test.exs
test/web/mastodon_api/mastodon_api_controller_test.exs
test/web/twitter_api/twitter_api_test.exs