diff options
| author | Parménides GV <parmegv@sdf.org> | 2013-04-15 16:30:13 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2013-04-15 16:30:13 +0200 |
| commit | bb4e2e8f16f79c59806a017d8f37e2bdd10a4e87 (patch) | |
| tree | 6e1c13f8b23774277e427953215143fa7d51dbb5 /assets | |
| parent | 60e5f181c1a9f4f1851aafd059971ba5d05748f3 (diff) | |
| parent | 5f66e5765f52aab1907939018e40578e939dbc5f (diff) | |
Merge branch 'wizard' into feature/wizard
Conflicts:
src/se/leap/leapclient/ConfigHelper.java
src/se/leap/leapclient/ConfigurationWizard.java
src/se/leap/leapclient/ProviderAPI.java
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/urls/bitmask.url | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/assets/urls/bitmask.url b/assets/urls/bitmask.url index f83ead86..910f0400 100644 --- a/assets/urls/bitmask.url +++ b/assets/urls/bitmask.url @@ -3,5 +3,5 @@ "assets_json_provider" : "providers/bitmask.net_provider.json",
"json_provider" : "https://bitmask.net/provider.json",
"cert" : "https://bitmask.net/ca.crt",
- "json_eip_service" : "https://api.bitmask.net/1/config/eip-service.json"
+ "json_eip_service" : "https://api.bitmask.net:4430/1/config/eip-service.json"
}
\ No newline at end of file |