aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeroenpraat <jeroenpraat@xs4all.nl>2014-06-29 23:27:55 +0000
committerjeroenpraat <jeroenpraat@xs4all.nl>2014-06-29 23:27:55 +0000
commitf3b1868005a50e4febadbbe9da5b5603a04dae73 (patch)
tree207b61f11476210bf83315f1df742ceec1ff18ae
parent52adbb650409bcdd19b1381e78827a1aaba9aae5 (diff)
parent1a715adb34c6a735202fa759de5b74fe0f20a4f8 (diff)
downloadvolse-hubzilla-f3b1868005a50e4febadbbe9da5b5603a04dae73.tar.gz
volse-hubzilla-f3b1868005a50e4febadbbe9da5b5603a04dae73.tar.bz2
volse-hubzilla-f3b1868005a50e4febadbbe9da5b5603a04dae73.zip
Merge branch 'master' of https://github.com/friendica/red
-rwxr-xr-xboot.php3
-rw-r--r--version.inc2
2 files changed, 3 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index c8b529d42..7c46afc2f 100755
--- a/boot.php
+++ b/boot.php
@@ -71,7 +71,8 @@ $DIRECTORY_FALLBACK_SERVERS = array(
'https://zotid.net',
'https://redmatrix.nl',
'https://whogotzot.com',
- 'https://red.mariovavti.com'
+ 'https://red.mariovavti.com',
+ 'https://red.zottel.red'
);
diff --git a/version.inc b/version.inc
index e7a0f43d3..2907d7608 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-06-28.720
+2014-06-29.721