Thibaut Girka 2b7158427f Merge branch 'master' into glitch-soc/merge-upstream		2019-11-30 17:29:44 +01:00
..
environments
initializers	Fix weird edge case in load_schema	2019-11-20 19:19:57 +01:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-30 17:29:44 +01:00
webpack	Revert CircleCI and some webpack changes to match upstream	2019-11-20 18:05:24 +01:00
application.rb	Fix localization test failing due to order of locale definitions (#12393)	2019-11-15 21:00:09 +01:00
boot.rb
brakeman.ignore
database.yml
deploy.rb
environment.rb
i18n-tasks.yml	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-20 15:36:09 +01:00
navigation.rb
pghero.yml	Use override_csp options on pghero (#12489)	2019-11-27 05:28:11 +01:00
puma.rb
routes.rb	Add bookmarks (#7107)	2019-11-13 23:02:10 +01:00
secrets.yml
settings.yml	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-27 12:14:01 +01:00
sidekiq.yml
webpacker.yml