Thibaut Girka 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json		2019-08-19 21:49:35 +02:00
..
environments	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
initializers	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
webpack	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
application.rb	Change locale detection to run once per session (#8657)	2019-07-21 18:08:02 +02:00
boot.rb
brakeman.ignore
database.yml
deploy.rb
environment.rb
i18n-tasks.yml	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
navigation.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-06 13:16:53 +02:00
puma.rb	Make puma bind address configurable with BIND env var (#11326)	2019-07-16 16:12:01 +02:00
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
secrets.yml
settings.yml	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
sidekiq.yml	Add tootctl preview_cards remove (#11320)	2019-07-28 13:48:19 +02:00
webpacker.yml