summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorkali <kali@leap.se>2013-03-26 02:27:33 +0900
committerkali <kali@leap.se>2013-03-26 02:27:33 +0900
commitd8ed08649d8337c1b5de8ae1e87a71435f3505f0 (patch)
tree015593af31ab422984ef47f859efef4c81c73bcc /data
parent36c944d24cd31fe380375ff7f8c709b1cf7c7827 (diff)
parentee2ea741883aa6fa3b168431d588f20a5e90f5f2 (diff)
Merge branch 'feature/windows_install_tap' of git://github.com/chiiph/leap_client into develop
Conflicts: src/leap/gui/mainwindow.py
Diffstat (limited to 'data')
0 files changed, 0 insertions, 0 deletions