diff options
author | Hamilton Kibbe <hamilton.kibbe@gmail.com> | 2014-10-26 17:20:47 -0400 |
---|---|---|
committer | Hamilton Kibbe <hamilton.kibbe@gmail.com> | 2014-10-26 17:20:47 -0400 |
commit | 254f3e51845de5679f11934a807e8f0f7d1f5713 (patch) | |
tree | ecff7bbb330b99472c5544140b3463250dd4052e /.gitignore | |
parent | 18e3b87625ddb739faeddffcaed48e12db6c7e8b (diff) | |
parent | d0eedf3dd7ee4fbf19f51de319e48dd964b93561 (diff) | |
download | gerbonara-254f3e51845de5679f11934a807e8f0f7d1f5713.tar.gz gerbonara-254f3e51845de5679f11934a807e8f0f7d1f5713.tar.bz2 gerbonara-254f3e51845de5679f11934a807e8f0f7d1f5713.zip |
Merge changes from upstream
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -38,9 +38,9 @@ nosetests.xml .idea/misc.xml .idea -# Komodo +# Komodo Files *.komodoproject -# OS +# OS Files .DS_Store Thumbs.db
\ No newline at end of file |