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 4aa6aba6ee 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
..
babel.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
css.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
file.js	Bump webpacker from 3.5.5 to 4.0.2 (#10277)	6 years ago
index.js	Bump webpacker from 3.5.5 to 4.0.2 (#10277)	6 years ago
mark.js	Bump webpacker from 3.5.5 to 4.0.2 (#10277)	6 years ago
node_modules.js	fix: update to emoji-mart 2.10.0 (#10281)	6 years ago