Miguel Jacq 45d6a94d38

Fix conflict from develop branch

2018-09-04 11:43:35 +10:00

..

__init__.py

Merge branch 'license' into develop

2018-06-18 19:29:03 -07:00

alert.py

Merge branch 'license' into develop

2018-06-18 19:29:03 -07:00

downloads.py

Merge branch 'license' into develop

2018-06-18 19:29:03 -07:00

file_selection.py

Merge branch 'license' into develop

2018-06-18 19:29:03 -07:00

onionshare_gui.py

Merge branch 'lingering_object_naming_issues' of https://github.com/mig5/onionshare into mig5-lingering_object_naming_issues

2018-09-02 13:33:35 -07:00

server_status.py

Merge branch 'license' into develop

2018-06-18 19:29:03 -07:00

settings_dialog.py

Fix conflict from develop branch

2018-09-04 11:43:35 +10:00

tor_connection_dialog.py

Merge branch 'license' into develop

2018-06-18 19:29:03 -07:00

update_checker.py

Merge branch 'license' into develop

2018-06-18 19:29:03 -07:00