diff options
| author | drebs <drebs@leap.se> | 2013-02-09 22:27:22 -0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-02-09 22:27:22 -0200 |
| commit | 46a3373295a683db9b66c233b07a7a948b8147bc (patch) | |
| tree | 410a47871bfd8654ddabbb53f3c29a89c1550e71 /.gitignore | |
| parent | e726f3df7c7efbe4069846468ffdbed6829ccfc4 (diff) | |
| parent | b376948ccd59aa02022123102eaae359a536e4e6 (diff) | |
Merge branch 'develop' into feature/soledad-api
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -15,7 +15,6 @@ docs/covhtml include/ lib/ local/ -man/ share/ src/leap.egg-info/ src/leap_client.egg-info @@ -25,3 +24,4 @@ src/*.egg-info pkg/osx/dist pkg/osx/build MANIFEST +_trial_temp* |