summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2012-05-09 10:31:34 +0000
committerChristoph Helma <helma@in-silico.ch>2012-05-09 10:31:34 +0000
commit51f64588a0c4b0ebd14c0641d25b72a1fe5fc2eb (patch)
tree20f106f199e59fd8dae1b32c8732a9319624e194 /.gitignore
parent950fffe995027a8463459363a7e6bd069c34fbef (diff)
parentaf80cd0ee7c5ecfc8033952b11382b50f67f99e8 (diff)
Merge branch 'development' into feature/task
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index f6e834a..c9daf01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ Gemfile.lock
*.gem
.bundle
pkg/*
+*~