projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch '2272-setup-user-in-workbench-TC' into 2272-setup-user-in-workbench
[arvados.git]
/
apps
/
workbench
/
.gitignore
diff --git
a/apps/workbench/.gitignore
b/apps/workbench/.gitignore
index 1c551bc901fbde5ddc5d9d368edf7a67104d7c48..a656a5bc61f6dc05b29b840c25084fbfe62a375f 100644
(file)
--- a/
apps/workbench/.gitignore
+++ b/
apps/workbench/.gitignore
@@
-22,7
+22,7
@@
/config/environments/development.rb
/config/environments/test.rb
/config/environments/production.rb
-/config/
config
.yml
+/config/
application
.yml
/config/piwik.yml