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 a4c9bda771 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/styles/mastodon-light.scss config/locales/en.yml config/locales/fr.yml config/locales/simple_form.pl.yml config/themes.yml Conflicts resolved by deleting config/themes.yml, marking app/javascript/styles/mastodon-light.scss as added, and taking all new translation strings, not removing anything from them.		7 years ago
..
environments	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
initializers	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
webpack	Merge branch 'master' into glitch-soc/merge	7 years ago
application.rb	Merge branch 'master' into glitch-soc/merge	7 years ago
boot.rb	…
brakeman.ignore	…
database.yml	…
deploy.rb	…
environment.rb	…
i18n-tasks.yml	Ignore tootsuite-specific theme-related translation strings	7 years ago
navigation.rb	…
puma.rb	…
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
secrets.yml	…
settings.yml	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
sidekiq.yml	…
webpacker.yml	…