summaryrefslogtreecommitdiff
path: root/src/leap/__init__.py
diff options
context:
space:
mode:
authorTomas Touceda <chiiph@leap.se>2013-04-11 15:07:54 -0300
committerTomas Touceda <chiiph@leap.se>2013-04-11 15:07:54 -0300
commite0032a6c97b3ed766698521c76bc37d0655f4277 (patch)
tree7808ca6adc8babf42aab34b7cad4271780dda0a9 /src/leap/__init__.py
parentb585cefa15a1d7a03dd8a6c5651220ac3fd94fd1 (diff)
parentcf6c30f6f046401dead7a990f56bf9ad2c7cfa01 (diff)
Merge remote-tracking branch 'kali/feature/single-instance-app2' into develop
Conflicts: src/leap/gui/mainwindow.py
Diffstat (limited to 'src/leap/__init__.py')
0 files changed, 0 insertions, 0 deletions