summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-09-20 03:15:13 +0900
committerkali <kali@leap.se>2012-09-20 03:15:13 +0900
commitdb704eecf513fcc48365844523557d6edab28293 (patch)
treef37516c86c5d77f23f7e57d80ee4c39b3b651c3e /tests
parentadd7973b3d1633b2776cb90f237415c6cac65d99 (diff)
parent50396fca082652dd1a1617e0d029c1c726e4c651 (diff)
Merge branch 'develop' into feature/systray-menu
Conflicts: src/leap/app.py
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions