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		2018-08-31 19:10:57 +02:00
..
environments	Move CSP headers to the appropriate Rails configuration	2018-08-22 20:39:33 +02:00
initializers	Fix CSP with S3/SWIFT hosts	2018-08-28 22:10:40 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-31 19:10:57 +02:00
webpack	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-26 14:23:24 +02:00
application.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-31 19:10:57 +02:00
boot.rb	Upgrade Rails to version 5.2.0 (#5898)	2018-04-12 14:45:17 +02:00
brakeman.ignore	Add animate custom emoji param to embed pages (#8507)	2018-08-30 23:14:01 +02:00
database.yml	use-DB_NAME-in-development (#5430)	2017-10-17 11:45:37 +02:00
deploy.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
environment.rb	…
i18n-tasks.yml	Ignore tootsuite-specific theme-related translation strings	2018-05-10 00:03:34 +02:00
navigation.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-07-17 22:05:25 +02:00
puma.rb	Revert "Default puma to running on localhost only." (#8444)	2018-08-26 00:13:22 +02:00
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-24 15:10:34 +02:00
secrets.yml	…
settings.yml	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-01 22:20:25 +02:00
sidekiq.yml	Account archive download (#6460)	2018-02-21 23:21:32 +01:00
webpacker.yml	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00