Merge branch 'develop' into notifications-from-account
authorEgor Kislitsyn <egor@kislitsyn.com>
Wed, 15 Jan 2020 12:49:45 +0000 (16:49 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Wed, 15 Jan 2020 12:49:45 +0000 (16:49 +0400)
commit3849053c6adbb4024e8fbe60e908cb141204f594
tree173a6a4283e37e90209da9f347d2954cf7be5e1a
parent34d85f8a5473fe0f85e8a8e9e8f58e40b3964ba4
parent77412d5dd24a384f9be7d6bc6b1538415c584802
Merge branch 'develop' into notifications-from-account
CHANGELOG.md
test/web/mastodon_api/controllers/notification_controller_test.exs