You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Yip 932571fa22 Merge tag 'v1.6.0' into sync/upstream		7 years ago
..
environments	Merge tag 'v1.6.0' into sync/upstream	7 years ago
initializers	Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4	7 years ago
locales	Fix Japanese translation (#4876)	7 years ago
webpack	Merge branch 'origin/master' into sync/upstream	7 years ago
application.rb	Merge tag 'v1.6.0rc3' into sync/upstream	7 years ago
boot.rb	…
brakeman.ignore	…
database.yml	…
deploy.rb	…
environment.rb	…
i18n-tasks.yml	…
navigation.rb	…
puma.rb	…
routes.rb	Merge branch 'origin/master' into sync/upstream	7 years ago
secrets.yml	…
settings.yml	Merge tag 'v1.6.0' into sync/upstream	7 years ago
sidekiq.yml	…
webpacker.yml	…