summaryrefslogtreecommitdiff
path: root/assets
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-03-25 21:14:42 +0100
committerParménides GV <parmegv@sdf.org>2014-03-25 21:14:42 +0100
commit8a754e30011bf60ac9bff2cf987c3fa263b3d924 (patch)
tree8c57aecf2b0e7ffcbe58b0d2b645a98649bbd044 /assets
parente663b8dcb87b5ec1744cecf77d493276a52fa9ab (diff)
parentee5fd2359fde105fcf3ca38a1109a3a19845530e (diff)
Merge branch 'bug/replace-bitmask.net-provider-with-demo.bitmask.net' into develop
Diffstat (limited to 'assets')
-rw-r--r--assets/urls/bitmask demo.url3
-rw-r--r--assets/urls/bitmask.url3
2 files changed, 3 insertions, 3 deletions
diff --git a/assets/urls/bitmask demo.url b/assets/urls/bitmask demo.url
new file mode 100644
index 00000000..1a412055
--- /dev/null
+++ b/assets/urls/bitmask demo.url
@@ -0,0 +1,3 @@
+{
+ "main_url" : "https://demo.bitmask.net/"
+}
diff --git a/assets/urls/bitmask.url b/assets/urls/bitmask.url
deleted file mode 100644
index f924301e..00000000
--- a/assets/urls/bitmask.url
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "main_url" : "https://bitmask.net/"
-} \ No newline at end of file