diff options
| author | drebs <drebs@leap.se> | 2013-06-13 12:11:29 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-06-13 12:11:29 -0300 |
| commit | 0deaa2070a88404779ae9a8dab88ee11521c5032 (patch) | |
| tree | 571c09145e1a9baf649bee6b1a0856a868580ccf /soledad_server/setup.py | |
| parent | 92724a1bf110a6f97dbfaec4a7d68388eef19dc5 (diff) | |
| parent | 7a737ff200c63e7d3a2dc5619b619e07b56fc6a2 (diff) | |
Merge remote-tracking branch 'remotes/chiiph/bug/modifiable_timeout' into develop
Diffstat (limited to 'soledad_server/setup.py')
0 files changed, 0 insertions, 0 deletions