diff options
| author | Christoph Helma <helma@in-silico.ch> | 2012-05-09 10:41:22 +0000 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2012-05-09 10:41:22 +0000 |
| commit | 17534aa7c7b1568dbbe257ea53efe87010913887 (patch) | |
| tree | c53a19748184e02ebb7bbe3988ba5cec664ec070 /.gitignore | |
| parent | fe17dd821a686eb59e1403b42014ce0c30e2e610 (diff) | |
| parent | 5d36335505385608179f9f50811dff0e605f307f (diff) | |
Merge branch 'development' into feature/task
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -2,3 +2,5 @@ Gemfile.lock *.gem .bundle pkg/* +Gemfile.lock +*~ |