ingvar1995 4c1a02c9a3 Merge branch 'file_transfers' ... Conflicts: src/mainscreen.py		2016-03-22 20:32:29 +03:00
..
file.wav	Merge branch 'file_transfers'	2016-03-22 20:32:29 +03:00
message.wav	Merge branch 'file_transfers'	2016-03-22 20:32:29 +03:00