diff options
author | vmaffione <v.maffione@gmail.com> | 2017-04-04 10:33:45 +0000 |
---|---|---|
committer | vmaffione <v.maffione@gmail.com> | 2017-04-04 10:33:45 +0000 |
commit | ef723aedeba64f2b5e02acac43e34ac23cd8ddb7 (patch) | |
tree | bd420be36adf48ccdff46261a9882cec51a6cfe0 /.gitignore | |
parent | e4406285047631caabbb50082d6e4fcafe27697e (diff) | |
parent | 0018610178892296c23ee2ca72bf05b5b41c23b9 (diff) | |
download | rumba-ef723aedeba64f2b5e02acac43e34ac23cd8ddb7.tar.gz rumba-ef723aedeba64f2b5e02acac43e34ac23cd8ddb7.zip |
Merge branch 'master-marco' into 'master'
qemu testbed
See merge request !17
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -93,3 +93,6 @@ ENV/ *rspec *.pem + +# PyCharm metadata folder +.idea |