Sachin Joshi a0c65bbd6c Merge branch 'develop' into 'remove-avatar-header' ... # Conflicts: # CHANGELOG.md		2019-06-23 03:25:50 +00:00
..
mastodon_api_controller
account_view_test.exs	Mastodon API: Sanitize display names	2019-06-18 14:12:11 +03:00
list_view_test.exs
mastodon_api_controller_test.exs	Merge branch 'develop' into 'remove-avatar-header'	2019-06-23 03:25:50 +00:00
notification_view_test.exs
push_subscription_view_test.exs
scheduled_activity_view_test.exs
search_controller_test.exs
status_view_test.exs
subscription_controller_test.exs