diff options
| author | drebs <drebs@leap.se> | 2013-01-24 12:03:45 -0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-01-24 12:03:45 -0200 |
| commit | e1494639f57cafddfd433c62adaa52a21f104e10 (patch) | |
| tree | b9e6b700db7ab9d9b3f927222eb0f780e7c851d8 /pkg/linux/resolv-update | |
| parent | 19da34c598ce6db172c1e1a8978bf031fc6db89b (diff) | |
| parent | 1dec55b5c5054a4c42534c0f7e9b8bad5b82c27c (diff) | |
Merge branch 'feature/soledad-api' into develop
Conflicts:
src/leap/soledad/util.py
Diffstat (limited to 'pkg/linux/resolv-update')
0 files changed, 0 insertions, 0 deletions