diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-03-26 12:15:09 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-03-26 12:15:09 +0100 |
| commit | c946bed3e63d9d271cd08d4c33e564a157908c36 (patch) | |
| tree | e5869abb9eb941e340a7968b34225c7a58199161 /assets/urls | |
| parent | 0323676ef98b12af3c7ce20bf4101bdc900ef654 (diff) | |
| parent | 8a754e30011bf60ac9bff2cf987c3fa263b3d924 (diff) | |
Merge branch 'develop' into release-0.5
Diffstat (limited to 'assets/urls')
| -rw-r--r-- | assets/urls/bitmask demo.url | 3 | ||||
| -rw-r--r-- | assets/urls/bitmask.url | 3 |
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 |