diff options
author | Christoph Helma <helma@in-silico.ch> | 2012-05-09 10:31:34 +0000 |
---|---|---|
committer | Christoph Helma <helma@in-silico.ch> | 2012-05-09 10:31:34 +0000 |
commit | 51f64588a0c4b0ebd14c0641d25b72a1fe5fc2eb (patch) | |
tree | 20f106f199e59fd8dae1b32c8732a9319624e194 /.gitignore | |
parent | 950fffe995027a8463459363a7e6bd069c34fbef (diff) | |
parent | af80cd0ee7c5ecfc8033952b11382b50f67f99e8 (diff) |
Merge branch 'development' into feature/task
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -2,3 +2,4 @@ Gemfile.lock *.gem .bundle pkg/* +*~ |