Claire 15929a3d59 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes. - `app/javascript/packs/mailer.js`: We had removed the file. Move the changes to `app/javascript/core/mailer.js`.		2022-06-11 00:08:41 +02:00
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-25 17:09:32 +02:00
initializers	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-02 09:49:38 +02:00
locales	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +02:00
locales-glitch	Make “Flavour and skin” admin setting label translatable (#1791)	2022-05-31 16:52:52 +02:00
webpack	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-04 17:25:57 +02:00
application.rb	Change search indexing to use batches to minimize resource usage (#18451)	2022-05-18 23:29:14 +02:00
boot.rb	Bump bootsnap from 1.6.0 to 1.8.1 (#16677)	2021-09-19 14:42:32 +09:00
brakeman.ignore	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2022-03-22 10:07:11 +01:00
database.yml	Format JSON and YAML using Prettier (#17823)	2022-03-21 04:46:11 +01:00
deploy.rb	Bump capistrano from 3.16.0 to 3.17.0 (#17774)	2022-03-29 18:49:00 +09:00
environment.rb	…
i18n-tasks.yml	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-08 19:53:32 +02:00
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-10 11:51:43 +02:00
pghero.yml	…
puma.rb	…
routes.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-10 11:51:43 +02:00
secrets.yml	…
settings.yml	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-08 19:53:32 +02:00
sidekiq.yml	Change search indexing to use batches to minimize resource usage (#18451)	2022-05-18 23:29:14 +02:00
storage.yml	…
webpacker.yml	…