Merge branch 'master' into 1885-keep-proxy refs #1885
[arvados.git] / services / api / config /
drwxr-xr-x   ..
-rw-r--r-- 4514 application.default.yml
-rw-r--r-- 1579 application.rb
-rw-r--r-- 1822 application.yml.example
-rw-r--r-- 191 boot.rb
-rw-r--r-- 416 database.yml.sample
-rw-r--r-- 356 environment.rb
drwxr-xr-x - environments
drwxr-xr-x - initializers
drwxr-xr-x - locales
-rw-r--r-- 2346 routes.rb