summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/gui/preferenceswindow.py
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2014-11-03 12:13:46 +0100
committerKali Kaneko <kali@leap.se>2014-11-03 12:13:46 +0100
commit0fc71d08381c7e750dabc2fc6cf5ef957d51bb5a (patch)
tree907c872b37be164b7095fbf97a2d466b59b31b7e /src/leap/bitmask/gui/preferenceswindow.py
parentfa5fe88d47dd3e90d8336dbd56e9bf6b38acd811 (diff)
parent7b0dda2fde310fff5ea6ee57a5f18a554b8e665f (diff)
Merge tag '0.7.0rc3' into deb-0.7.1-rc3
Tag leap.bitmask version 0.7.0rc3 Conflicts: src/leap/bitmask/services/soledad/soledadbootstrapper.py
Diffstat (limited to 'src/leap/bitmask/gui/preferenceswindow.py')
0 files changed, 0 insertions, 0 deletions