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.

Claire 10a31a934f Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream's README got updated, but we have a completely different one. Kept ours.		4 years ago
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
initializers	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
locales	Fix some typos and improve some UI text (#16283)	4 years ago
locales-glitch	Glitchsoc translation to 'es' language (#1439)	4 years ago
webpack	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
application.rb	New Crowdin updates (#16269)	4 years ago
boot.rb	Add clean error message when RAILS_ENV is unset (#15381)	4 years ago
brakeman.ignore	Ignore brakeman false positive warning (#16213)	4 years ago
database.yml	…
deploy.rb	Bump capistrano from 3.15.0 to 3.16.0 (#15818)	4 years ago
environment.rb	…
i18n-tasks.yml	…
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
pghero.yml	…
puma.rb	…
routes.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
secrets.yml	…
settings.yml	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
sidekiq.yml	Add cold-start follow recommendations (#15945)	4 years ago
storage.yml	Update Mastodon to Rails 6.1 (#15910)	4 years ago
webpacker.yml	…