summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-12-15 20:48:11 +0100
committerParménides GV <parmegv@sdf.org>2014-12-15 20:48:11 +0100
commit953e87f2d9a175e242bdf5c0e030a6a9944aa3e5 (patch)
treec694b6bc5f893d4ad5b92712c85042ca4b45bbfa /app/assets
parentf9b875c58f2a370b0c4727ed54cab46424bda603 (diff)
parent9f146deb3448815fccc1637c00588e0dfb23293e (diff)
Merge branch 'develop' into release-0.8.1
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/urls/calyx.url3
-rw-r--r--app/assets/urls/riseup.url3
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/urls/calyx.url b/app/assets/urls/calyx.url
new file mode 100644
index 00000000..8de04fe9
--- /dev/null
+++ b/app/assets/urls/calyx.url
@@ -0,0 +1,3 @@
+{
+ "main_url" : "https://calyx.net/"
+}
diff --git a/app/assets/urls/riseup.url b/app/assets/urls/riseup.url
new file mode 100644
index 00000000..4548b433
--- /dev/null
+++ b/app/assets/urls/riseup.url
@@ -0,0 +1,3 @@
+{
+ "main_url" : "https://riseup.net/"
+}