summaryrefslogtreecommitdiff
path: root/app/assets/urls
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-06-16 11:28:05 +0200
committerParménides GV <parmegv@sdf.org>2015-06-16 11:28:05 +0200
commit66c79953db6876ec17a7ebf50dc4fd07d24fae37 (patch)
tree67075abe6ea28f7fc7213f654b86464b13507058 /app/assets/urls
parent1f41fec6765e49838141ad29151713c7ac3dd17c (diff)
parente533cf6939e3ea4233aa8a82812f8ce5fcb565ca (diff)
Merge branch 'develop'0.9.4
Diffstat (limited to 'app/assets/urls')
-rw-r--r--app/assets/urls/bitmask demo.url3
-rw-r--r--app/assets/urls/calyx.url4
-rw-r--r--app/assets/urls/riseup.url3
3 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/urls/bitmask demo.url b/app/assets/urls/bitmask demo.url
index 1a412055..81bdba52 100644
--- a/app/assets/urls/bitmask demo.url
+++ b/app/assets/urls/bitmask demo.url
@@ -1,3 +1,4 @@
{
- "main_url" : "https://demo.bitmask.net/"
+ "main_url" : "https://demo.bitmask.net/",
+ "ca_cert_fingerprint" : "c3f9f39af6d42d1f201195dec918ac7603597049"
}
diff --git a/app/assets/urls/calyx.url b/app/assets/urls/calyx.url
index 8de04fe9..9ae902f7 100644
--- a/app/assets/urls/calyx.url
+++ b/app/assets/urls/calyx.url
@@ -1,3 +1,5 @@
{
- "main_url" : "https://calyx.net/"
+ "main_url" : "https://calyx.net/",
+ "ca_cert_fingerprint" : "98086aee17b5800acd0bdefe852e7c1ae72bd248"
+
}
diff --git a/app/assets/urls/riseup.url b/app/assets/urls/riseup.url
index 4548b433..4c565076 100644
--- a/app/assets/urls/riseup.url
+++ b/app/assets/urls/riseup.url
@@ -1,3 +1,4 @@
{
- "main_url" : "https://riseup.net/"
+ "main_url" : "https://riseup.net/",
+ "ca_cert_fingerprint" : "aef7a642d7f8e046770521b354961a95cd4a76a8"
}