Thibaut Girka 3baacf6993 Merge branch 'master' into glitch-soc/merge-upstream		2020-05-13 22:11:49 +02:00
..
environments	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-05 11:36:41 +02:00
initializers	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-10 16:19:56 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-13 22:11:49 +02:00
webpack	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-08 19:38:53 +01:00
application.rb	Fix sr locale being selected over sr-Latn (#13693)	2020-05-11 01:09:21 +02:00
boot.rb
brakeman.ignore
database.yml
deploy.rb	Include capistrano tasks that reload the services after deploying. (#12642)	2020-05-10 10:19:49 +02:00
environment.rb
i18n-tasks.yml	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-20 15:36:09 +01:00
navigation.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-24 14:37:06 +01:00
pghero.yml	Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)	2020-05-04 13:52:41 +02:00
puma.rb	Add PERSISTENT_TIMEOUT option (#11756)	2019-09-04 20:44:08 +02:00
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-10 16:19:56 +02:00
secrets.yml
settings.yml	Merge branch 'master' into glitch-soc/master	2019-12-19 13:52:54 +01:00
sidekiq.yml	Change trending hashtags to not disappear instantly after midnight (#11712)	2019-09-02 18:11:13 +02:00
webpacker.yml