Merge branch 'master' into 2257-inequality-conditions

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

diff --git a/apps/workbench/.gitignore b/apps/workbench/.gitignore
index 7a4b0ff9b0f3b57716eafe8e5c0b209b0dd46520..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
 
@@ -31,3 +32,6 @@
 # Capistrano files are coming from another repo
 /Capfile*
 /config/deploy*
+
+# Themes are coming from another repo
+/themes/*