4 commits

Author	SHA1	Message	Date
ingvar1995	6a7a38ef02	fixes	2016-06-17 15:19:38 +03:00
ingvar1995	e1db914f13	audio => develop	2016-04-24 13:45:11 +03:00
ingvar1995	dd8f0e07e0	missed contact.wav	2016-04-01 19:13:01 +03:00
ingvar1995	4c1a02c9a3	Merge branch 'file_transfers' ... Conflicts: src/mainscreen.py	2016-03-22 20:32:29 +03:00