diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-06 10:05:45 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-06 10:05:45 -0300 |
| commit | d6bf9b3e11ff87488a5f508acebf8f20ad026166 (patch) | |
| tree | a3de2d064e1bde8d2ae1efc923335d66965943a3 /pkg/__init__.py | |
| parent | e95351d812d98b4be6e1e3dafd6855804d95267a (diff) | |
| parent | 4028fc6be007d32209db8657809539d1e110302d (diff) | |
Merge remote-tracking branch 'kali/fix/fix_soledad_boostrap' into develop
Conflicts:
src/leap/services/soledad/soledadbootstrapper.py
Diffstat (limited to 'pkg/__init__.py')
0 files changed, 0 insertions, 0 deletions