projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into 1880-check-duplicate-public-key
[arvados.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index b25c15b81fae06e1c55946ac6270bfdb293870e8..81d2569b335d789dc9c91f941143df092546c123 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-1
+1,4
@@
*~
+*.pyc
+docker/*/generated/*
+docker/config.yml