diff options
| author | Micah Lee <micah@micahflee.com> | 2015-11-15 15:35:59 -0800 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2015-11-15 15:35:59 -0800 |
| commit | fd39f84bffa12bf0431c3bf817afafc04aa40ab2 (patch) | |
| tree | 1a383dd7808829a3847bbef71f2115342a242877 /setup.py | |
| parent | 55c4c0fac125309718568c16aa44d5e2077c6089 (diff) | |
| parent | 34591b5634bbec38d79acebff9684426485b5de4 (diff) | |
| download | onionshare-fd39f84bffa12bf0431c3bf817afafc04aa40ab2.tar.gz onionshare-fd39f84bffa12bf0431c3bf817afafc04aa40ab2.zip | |
Merge branch 'master' into ephemeral
Conflicts:
onionshare/helpers.py
onionshare/onionshare.py
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -123,5 +123,5 @@ elif system == 'Darwin': 'PyQt4.QtSvg', 'PyQt4.QtXmlPatterns'] } }, - setup_requires=['py2app'], + setup_requires=['py2app', 'flask', 'stem'], ) |