Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring		2022-12-15 20:25:25 +01:00
..
rules	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-01 17:02:18 +02:00
configuration.js	Refactor compile-time glitch-soc theme handling	2022-02-11 23:49:00 +01:00
development.js	Bump webpack-merge from 4.2.2 to 5.0.9 (#14424)	2020-11-05 02:21:28 +09:00
generateLocalePacks.js
production.js	Add brotli compression (#19025)	2022-12-15 17:07:36 +01:00
shared.js	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-04 17:25:57 +02:00
tests.js	Bump jest from 26.6.3 to 27.1.0 (#16376)	2021-08-28 09:58:04 +09:00
translationRunner.js