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 c077cdaba7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/relationships_controller.rb`: Upstream changed a line too close to a glitch-soc only line related to glitch-soc's theming system. Applied upstream changes accordingly.		4 years ago
..
environments	…
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	Add missing locales (#15138)	4 years ago
boot.rb	…
brakeman.ignore	…
database.yml	…
deploy.rb	…
environment.rb	…
i18n-tasks.yml	…
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	…