Merge branch 'master' into 2333-crunch-dispatch-token-management

[arvados.git] / services / api / .gitignore

diff --git a/services/api/.gitignore b/services/api/.gitignore
index 0e95cf8661c1c00d49935a80e7a685dc4300eddd..6ddf5231ced091461771a94999948f521136ad55 100644 (file)
--- a/services/api/.gitignore
+++ b/services/api/.gitignore
@@ -18,7 +18,7 @@
 /config/api.clinicalfuture.com.*
 /config/database.yml
 /config/initializers/omniauth.rb
-/config/config.yml
+/config/application.yml
 
 # asset cache
 /public/assets/