Merge branch 'file_transfers'

Conflicts:
	src/mainscreen.py
This commit is contained in:
ingvar1995 2016-03-22 20:32:29 +03:00
commit 4c1a02c9a3
15 changed files with 520 additions and 43 deletions

View file

@ -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):