Merge branch 'develop' into 'xenofem/pleroma-fe-rebased-image-description-authoring'

CHANGELOG.md

src/components/settings_modal/tabs/filtering_tab.js

src/components/status/status.js

src/components/timeline/timeline.js

src/components/timeline/timeline.vue

src/i18n/en.json

src/modules/statuses.js

src/services/api/api.service.js

src/services/timeline_fetcher/timeline_fetcher.service.js