Merge branch 'master' into 2316-no-clear-tmp-flag

[arvados.git] / apps / workbench / .gitignore

diff --git a/apps/workbench/.gitignore b/apps/workbench/.gitignore
index 89efb8185f003a5019d99a83a547798fcdca6a0d..a656a5bc61f6dc05b29b840c25084fbfe62a375f 100644 (file)
--- a/apps/workbench/.gitignore
+++ b/apps/workbench/.gitignore
@@ -22,6 +22,7 @@
 /config/environments/development.rb
 /config/environments/test.rb
 /config/environments/production.rb
+/config/application.yml
 
 /config/piwik.yml