diff options
| author | Kali Kaneko <kali@leap.se> | 2016-04-25 21:32:54 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2016-04-25 21:32:54 -0400 |
| commit | 434d0534661d7c222e5dabc4e5e237b060d2212b (patch) | |
| tree | 2e7bf0e556f983bd5404481a9aa4fb0fd7d75778 /src/leap/bitmask/backend/api.py | |
| parent | 9ee728108f3b894d097206cc6ff6d0a70808f2d5 (diff) | |
| parent | f47416804ad2f88ba27aa032e0d2fc1c9fd314c8 (diff) | |
Merge branch 'develop' into debian/experimental
Diffstat (limited to 'src/leap/bitmask/backend/api.py')
| -rw-r--r-- | src/leap/bitmask/backend/api.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/leap/bitmask/backend/api.py b/src/leap/bitmask/backend/api.py index 48aa2090..2fd983ae 100644 --- a/src/leap/bitmask/backend/api.py +++ b/src/leap/bitmask/backend/api.py @@ -42,6 +42,8 @@ API = ( "keymanager_export_keys", "keymanager_get_key_details", "keymanager_list_keys", + "pixelated_start_service", + "pixelated_stop_service", "provider_bootstrap", "provider_cancel_setup", "provider_get_all_services", @@ -57,6 +59,7 @@ API = ( "soledad_change_password", "soledad_close", "soledad_load_offline", + "soledad_get_service_token", "tear_fw_down", "bitmask_root_vpn_down", "user_cancel_login", @@ -135,6 +138,7 @@ SIGNALS = ( "soledad_offline_finished", "soledad_password_change_error", "soledad_password_change_ok", + "soledad_got_service_token", "srp_auth_bad_user_or_password", "srp_auth_connection_error", "srp_auth_error", |