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
..
rules	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
configuration.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
development.js	Bump webpacker from 3.5.5 to 4.0.2 (#10277)	6 years ago
generateLocalePacks.js	Javascript intl8n flavour support	7 years ago
production.js	perf: remove stats.json generation in webpack (#10290)	6 years ago
shared.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
test.js	Upgrade webpack to version v4.x (#6655)	6 years ago
translationRunner.js	Upgrade yargs to v12.0 (#9862)	6 years ago