summaryrefslogtreecommitdiff
path: root/data/images
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-06 10:05:45 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-06 10:05:45 -0300
commitd6bf9b3e11ff87488a5f508acebf8f20ad026166 (patch)
treea3de2d064e1bde8d2ae1efc923335d66965943a3 /data/images
parente95351d812d98b4be6e1e3dafd6855804d95267a (diff)
parent4028fc6be007d32209db8657809539d1e110302d (diff)
Merge remote-tracking branch 'kali/fix/fix_soledad_boostrap' into develop
Conflicts: src/leap/services/soledad/soledadbootstrapper.py
Diffstat (limited to 'data/images')
0 files changed, 0 insertions, 0 deletions