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
..
html	If "Stop sharing automatically" is selected, only allow one download at a time (fixes #248)	2016-04-12 15:59:49 -07:00
images	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
locale	Merge branch 'master' of https://github.com/eightnoteight/onionshare into eightnoteight-master	2016-12-22 16:00:06 -08:00
license.txt	Move license.txt into resources, so it will be bundled with Windows installer	2016-09-04 21:07:55 -07:00
version.txt	Update changelog and version bump to 0.9.2	2016-11-13 13:07:14 -08:00
wordlist.txt	Replaced wordlist with well researched and more usable wordlist from EFF	2016-12-17 17:05:53 -08:00