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 8b4abaa90d Merge branch 'master' into glitch-soc/master ... Conflicts: config/routes.rb Added the “endorsements” route from upstream.		6 years ago
..
environments	…
initializers	Merge branch 'master' into glitch-soc/master	6 years ago
locales	Merge branch 'master' into glitch-soc/master	6 years ago
webpack	…
application.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
boot.rb	…
brakeman.ignore	Add remote interaction dialog for toots (#8202)	6 years ago
database.yml	…
deploy.rb	…
environment.rb	…
i18n-tasks.yml	…
navigation.rb	…
puma.rb	…
routes.rb	Merge branch 'master' into glitch-soc/master	6 years ago
secrets.yml	…
settings.yml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
sidekiq.yml	…
webpacker.yml	…