diff options
| author | kwadronaut <kwadronaut@leap.se> | 2017-05-17 11:05:41 +0200 |
|---|---|---|
| committer | kwadronaut <kwadronaut@leap.se> | 2017-05-17 11:05:41 +0200 |
| commit | ac4047ce11c91a752c910f4afcd24f69a1621ef3 (patch) | |
| tree | 044b866f2bd9a83246a6128c0e6f8afc4ce5a9d0 /app/assets | |
| parent | 66c79953db6876ec17a7ebf50dc4fd07d24fae37 (diff) | |
| parent | 59985587c758f93844df7600f18c0837c672f259 (diff) | |
Merge branch 'develop' move to 'master-'based development
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/urls/bitmask demo.url | 3 | ||||
| -rw-r--r-- | app/assets/urls/calyx.url | 4 | ||||
| -rw-r--r-- | app/assets/urls/riseup.url | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/app/assets/urls/bitmask demo.url b/app/assets/urls/bitmask demo.url index 81bdba52..1a412055 100644 --- a/app/assets/urls/bitmask demo.url +++ b/app/assets/urls/bitmask demo.url @@ -1,4 +1,3 @@ {
- "main_url" : "https://demo.bitmask.net/",
- "ca_cert_fingerprint" : "c3f9f39af6d42d1f201195dec918ac7603597049"
+ "main_url" : "https://demo.bitmask.net/"
}
diff --git a/app/assets/urls/calyx.url b/app/assets/urls/calyx.url index 9ae902f7..8de04fe9 100644 --- a/app/assets/urls/calyx.url +++ b/app/assets/urls/calyx.url @@ -1,5 +1,3 @@ { - "main_url" : "https://calyx.net/", - "ca_cert_fingerprint" : "98086aee17b5800acd0bdefe852e7c1ae72bd248" - + "main_url" : "https://calyx.net/" } diff --git a/app/assets/urls/riseup.url b/app/assets/urls/riseup.url index 4c565076..4548b433 100644 --- a/app/assets/urls/riseup.url +++ b/app/assets/urls/riseup.url @@ -1,4 +1,3 @@ { - "main_url" : "https://riseup.net/", - "ca_cert_fingerprint" : "aef7a642d7f8e046770521b354961a95cd4a76a8" + "main_url" : "https://riseup.net/" } |