Micah Lee ed1ada9c06 Merge branch 'develop' into 918_old_linux		2019-04-18 19:57:46 -07:00
..
web	Merge branch 'develop' into 918_old_linux	2019-04-18 19:57:46 -07:00
__init__.py	include years in the dates from CLI, in case it's a very long timer or perhaps we're crossing into a new year	2019-03-25 15:33:00 +11:00
common.py	Standardise all shutdown_timer, shutdown_timeout, timeout attributes as 'autostop_timer'	2019-03-25 15:05:54 +11:00
onion.py	Fix conflicts	2019-03-25 13:43:08 +11:00
onionshare.py	Standardise all shutdown_timer, shutdown_timeout, timeout attributes as 'autostop_timer'	2019-03-25 15:05:54 +11:00
settings.py	Standardise all startup_timer, scheduled_start attributes as 'autostart_timer'	2019-03-25 15:28:31 +11: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