diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-21 14:50:28 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-21 14:50:28 -0300 |
| commit | 0de5ddd4aa0bb2eef41572d61304719939f4f459 (patch) | |
| tree | 5ca9d38c3a77a57e7903c8c7da9c03892917ce26 /.gitignore | |
| parent | cb9453ea3abc35adb3707f2c9877777cc7a27893 (diff) | |
| parent | 50e5a604096365509b5d1a1fe810f4ec019eb0ee (diff) | |
Merge remote-tracking branch 'drebs/feature/3487_split-soledad-into-common-client-and-server-3' into develop
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -5,4 +5,10 @@ build/ MANIFEST *.egg-info/ *.egg +*.swp +*.swo +*.pyc +*.log +*.*~ + |