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 8c3c27bf06 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Upstream change too close to a glitch-soc change related to instance-local toots. Merged upstream changes. - `app/services/fan_out_on_write_service.rb`: Minor conflict due to glitch-soc's handling of Direct Messages, merged upstream changes. - `yarn.lock`: Not really a conflict, caused by glitch-soc-only dependencies being textually too close to updated upstream dependencies. Merged upstream changes.		4 years ago
..
rules	Fix build with new sass-loader	5 years ago
configuration.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
development.js	Code style improvements in JavaScript (#13159)	5 years ago
generateLocalePacks.js	…
production.js	Bump imports-loader from 0.8.0 to 1.1.0 (#14323)	4 years ago
shared.js	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
tests.js	Revert CircleCI and some webpack changes to match upstream	5 years ago
translationRunner.js	Upgrade yargs to v12.0 (#9862)	6 years ago