Merge branch 'file_transfers'

Conflicts: src/mainscreen.py
2016-03-22 20:32:29 +03:00
parent cd93d84dfd 6ffa15b4d7
commit 4c1a02c9a3
15 changed files with 520 additions and 43 deletions
--- a/src/util.py
+++ b/src/util.py
@@ -3,7 +3,7 @@ import time
 from platform import system


-program_version = '0.0.1 (alpha)'
+program_version = '0.0.2 (alpha)'


 def log(data):