Merge branch 'develop' into gun
authorAlexander Strizhakov <alex.strizhakov@gmail.com>
Mon, 30 Mar 2020 09:15:23 +0000 (12:15 +0300)
committerAlexander Strizhakov <alex.strizhakov@gmail.com>
Mon, 30 Mar 2020 09:15:23 +0000 (12:15 +0300)
commitf497cf2f7c21196c4d633ddf0d14f0a4ede00cea
tree6ef3981f250af6c67619e9d48176c131328b76aa
parent7f9b5284fa7dd1d9100de730a6fe0c93739d1b30
parente999c67cee65cfe07de6dc76ad18f213c0252bb3
Merge branch 'develop' into gun
CHANGELOG.md
config/description.exs
docs/API/admin_api.md
mix.exs
test/notification_test.exs
test/support/http_request_mock.ex
test/web/admin_api/admin_api_controller_test.exs
test/web/mastodon_api/views/notification_view_test.exs
test/web/mastodon_api/views/status_view_test.exs