Miguel Jacq b385d6bac7 merge from develop and fix conflicts, update poetry		2021-05-06 14:30:29 +10:00
..
resources	Change version to 2.3.2.dev1	2021-05-04 20:21:10 -07:00
web	Merge branch 'develop' into 1275_fix_website_mode	2021-05-04 20:02:54 -07:00
__init__.py	merge from develop and fix conflicts, update poetry	2021-05-06 14:30:29 +10:00
common.py	Fix log colors so it isn't black on black in macOS	2021-05-02 15:49:43 -07:00
mode_settings.py	merge from develop and fix conflicts, update poetry	2021-05-06 14:30:29 +10:00
onion.py	merge from develop and fix conflicts, update poetry	2021-05-06 14:30:29 +10:00
onionshare.py	Remove v2 legacy onion support, and its corresponding client auth functionality. Update the v3 Client Auth to take its place in settings	2021-05-06 14:26:00 +10:00
settings.py	Fix flake8 issues found in cli	2021-04-29 17:13:05 -07:00