You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 3f8f1b01c0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/services/remove_status_service.rb Conflict because we still handle the direct timeline. Took upstream changes, with that one extra function call. - config/locales/ca.yml Conflict because theme names were updated. Decided to *keep* the theme names even if they are useless to avoid future conflicts. - config/locales/oc.yml Decided to *keep* the theme names even if they are useless to avoid future conflicts. - config/locales/pl.yml Decided to *keep* the theme names even if they are useless to avoid future conflicts.		6 years ago
..
components	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
containers	Add UI for creating polls (#10184)	6 years ago
util	Misc. typos (#8694)	6 years ago
index.js	Refactor icons in web UI to use Icon component (#9951)	6 years ago