config/test.exs · 0e37fddd5abad5db0378c8186513fbba0fbd6586 · NEETzsche / pleroma

Forked from Pleroma / pleroma

12187 commits behind the upstream repository.

5 years ago

Merge develop to 788-separate-email-addresses · c3495737

Alexander Strizhakov authored 5 years ago

Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs

c3495737

History

Merge develop to 788-separate-email-addresses

Alexander Strizhakov authored 5 years ago

Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs