Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-03 23:15:18 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into ephemeral

Browse source 
Conflicts:
	onionshare/helpers.py
	onionshare/onionshare.py
This commit is contained in:
Micah Lee 2015-11-15 15:35:59 -08:00
commit fd39f84bff
11 changed files with 92 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
setup.py
View file

@ -123,5 +123,5 @@ elif system == 'Darwin':
'PyQt4.QtSvg', 'PyQt4.QtXmlPatterns']
}
},
setup_requires=['py2app'],
setup_requires=['py2app', 'flask', 'stem'],
)