hiro 8eeb043ee2 Fix merge conflicts with upstream

2019-04-23 16:20:33 +02:00

..

web

Fix merge conflicts with upstream

2019-04-23 16:20:33 +02:00

__init__.py

Add gui for website sharing and listing

2019-04-23 16:09:40 +02:00

common.py

Rename debug to verbose in all relevant places

2019-04-18 19:53:21 -07:00

onion.py

Remove more CLI strings

2019-04-21 12:58:53 -07:00

onionshare.py

Standardise all shutdown_timer, shutdown_timeout, timeout attributes as 'autostop_timer'

2019-03-25 15:05:54 +11:00

settings.py

Fix loading custom config if provided

2019-04-20 14:43:04 +10:00

strings.py

If a locale file includes a blank string, fallback to English instead of using the blank string

2018-12-16 10:55:13 -08:00