Micah Lee 8fbb7c067f Merge branch 'master' of https://github.com/eightnoteight/onionshare into eightnoteight-master ...

Conflicts:
	onionshare/web.py
	onionshare_gui/onionshare_gui.py
	resources/locale/cs.json
	resources/locale/eo.json
	resources/locale/nl.json

This merge required quite a bit of refactoring because.

2016-12-22 16:00:06 -08:00

..

__init__.py

Update copyright year to 2016

2016-02-15 22:37:28 -08:00

downloads.py

Hide downloads progress bars until download starts, and improve the look of progress bar display

2016-12-22 15:15:37 -08:00

file_selection.py

Move all resources (locale, images, html, version.txt) into central resources dir, and clean up logic to find absolute paths to resources

2016-04-12 15:14:02 -07:00

onionshare_gui.py

Merge branch 'master' of https://github.com/eightnoteight/onionshare into eightnoteight-master

2016-12-22 16:00:06 -08:00

options.py

Move all resources (locale, images, html, version.txt) into central resources dir, and clean up logic to find absolute paths to resources

2016-04-12 15:14:02 -07:00

server_status.py

Move all resources (locale, images, html, version.txt) into central resources dir, and clean up logic to find absolute paths to resources

2016-04-12 15:14:02 -07:00