diff options
author | kali <kali@leap.se> | 2012-09-20 03:15:13 +0900 |
---|---|---|
committer | kali <kali@leap.se> | 2012-09-20 03:15:13 +0900 |
commit | db704eecf513fcc48365844523557d6edab28293 (patch) | |
tree | f37516c86c5d77f23f7e57d80ee4c39b3b651c3e /data/TODO | |
parent | add7973b3d1633b2776cb90f237415c6cac65d99 (diff) | |
parent | 50396fca082652dd1a1617e0d029c1c726e4c651 (diff) |
Merge branch 'develop' into feature/systray-menu
Conflicts:
src/leap/app.py
Diffstat (limited to 'data/TODO')
-rw-r--r-- | data/TODO | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/data/TODO b/data/TODO deleted file mode 100644 index 580227ac..00000000 --- a/data/TODO +++ /dev/null @@ -1 +0,0 @@ -icons file and stuff should be moved here at some point! |