Merge branch 'develop' into 406_osx_sandbox

This commit is contained in:
Micah Lee 2018-12-16 17:11:18 -08:00
commit 043237bc20
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
32 changed files with 1831 additions and 443 deletions

View file

@ -65,7 +65,6 @@ class TestSettings:
'slug': '',
'hidservauth_string': '',
'downloads_dir': os.path.expanduser('~/OnionShare'),
'receive_allow_receiver_shutdown': True,
'public_mode': False
}
for key in settings_obj._settings: