aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-08-27 18:55:02 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-08-27 18:55:02 -0700
commitc2bc6a04abd87b9e7a9aa742b8e5ff8ac711128a (patch)
tree2f2e495d481f0d612bf174d2ac2bd05b9876aa97
parent7b28c42693ff41da61abe4974c7a0a7412b6d6e5 (diff)
parent96c61fc5f26af06bf43ecae0819c095141e18db7 (diff)
downloadvolse-hubzilla-c2bc6a04abd87b9e7a9aa742b8e5ff8ac711128a.tar.gz
volse-hubzilla-c2bc6a04abd87b9e7a9aa742b8e5ff8ac711128a.tar.bz2
volse-hubzilla-c2bc6a04abd87b9e7a9aa742b8e5ff8ac711128a.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
-rwxr-xr-xboot.php2
-rw-r--r--version.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index 458d676d4..c4b600c43 100755
--- a/boot.php
+++ b/boot.php
@@ -80,7 +80,7 @@ $DIRECTORY_FALLBACK_SERVERS = array(
'https://zothub.com',
'https://zotid.net',
'https://red.zottel.red',
- 'https://redmatrix.info',
+ 'https://gravizot.de',
'https://my.federated.social',
'https://redmatrix.nl'
);
diff --git a/version.inc b/version.inc
index 988848405..e045f878a 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-08-26.1136
+2015-08-27.1137