Thibaut Girka 04534604c6 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/views/admin/dashboard/index.html.haml - config/locales/simple_form.en.yml		2019-08-07 13:56:48 +02:00
..
environments
initializers	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-30 12:22:33 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-07 13:56:48 +02:00
webpack	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-24 16:23:53 +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	Add type, limit, offset, min_id, max_id, account_id to search API (#10091)	2019-02-26 15:21:36 +01:00
database.yml	config: add DB_SSLMODE for managed/remote PG (#10210)	2019-03-08 14:36:28 +01:00
deploy.rb	Use the bundled Capistrano version (#9855)	2019-01-18 21:31:11 +01:00
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-06 13:16:53 +02:00
secrets.yml
settings.yml	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-07 13:56:48 +02:00
sidekiq.yml	Add tootctl preview_cards remove (#11320)	2019-07-28 13:48:19 +02:00
webpacker.yml	Do not try to parse gif files as CSS or JS	2019-03-16 14:23:50 +01:00