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 de5cc20dd8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict caused because of glitch-soc's theming system. Took upstream's new code and applied the theming system changes on top of it. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict caused because of glitch-soc's theming system. Took upstream's new code and applied the theming system changes on top of it.		4 years ago
..
environments	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
initializers	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
locales	Add follow selected followers button (#15148)	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	Fix streaming API allowing connections to persist after access token invalidation (#15111)	4 years ago
boot.rb	…
brakeman.ignore	Add E2EE API (#13820)	5 years ago
database.yml	…
deploy.rb	Bump capistrano from 3.14.0 to 3.14.1 (#14037)	5 years ago
environment.rb	…
i18n-tasks.yml	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
navigation.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
pghero.yml	…
puma.rb	…
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
secrets.yml	…
settings.yml	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
sidekiq.yml	…
webpacker.yml	…