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 6f75a9001f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/stream_entries/_simple_status.html.haml - config/locales/nl.yml Deleted unused translation strings (themes) and adapted minor changes to _simple_status.html.haml		6 years ago
..
environments	Move CSP headers to the appropriate Rails configuration	6 years ago
initializers	Fix CSP with S3/SWIFT hosts	6 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
webpack	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
application.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
boot.rb	Upgrade Rails to version 5.2.0 (#5898)	7 years ago
brakeman.ignore	Add animate custom emoji param to embed pages (#8507)	6 years ago
database.yml	…
deploy.rb	Update dependencies for Ruby (2018-04-23) (#7237)	7 years ago
environment.rb	…
i18n-tasks.yml	Ignore tootsuite-specific theme-related translation strings	7 years ago
navigation.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
puma.rb	Revert "Default puma to running on localhost only." (#8444)	6 years ago
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
secrets.yml	…
settings.yml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
sidekiq.yml	…
webpacker.yml	…