Micah Lee fd39f84bff Merge branch 'master' into ephemeral ...

Conflicts:
	onionshare/helpers.py
	onionshare/onionshare.py

2015-11-15 15:35:59 -08:00

..

__init__.py

Updated copyright year to 2015

2015-09-07 21:48:49 -07:00

common.py

Merge branch 'master' into ephemeral

2015-11-15 15:35:59 -08:00

downloads.py

Updated copyright year to 2015

2015-09-07 21:48:49 -07:00

file_selection.py

Updated copyright year to 2015

2015-09-07 21:48:49 -07:00

onionshare_gui.py

Merge branch 'master' into ephemeral

2015-11-15 15:35:59 -08:00

options.py

Updated copyright year to 2015

2015-09-07 21:48:49 -07:00

server_status.py

Merge branch 'master' into ephemeral

2015-11-15 15:35:59 -08:00