Merge branch 'master' into tres and add some work on the item_deleted flag refactor

Conflicts:
	include/attach.php
	include/onedirsync.php
	include/zot.php
	mod/locs.php

1 files changed, 4 insertions, 3 deletions

diff --git a/boot.php b/boot.php
index c52c1bc32..31d4ea1e7 100755
--- a/boot.php
+++ b/boot.php
@@ -81,10 +81,11 @@ define ( 'DIRECTORY_FALLBACK_MASTER',  'https://zothub.com');
 $DIRECTORY_FALLBACK_SERVERS = array( 
 	'https://zothub.com', 
 	'https://zotid.net', 
-	'https://redmatrix.nl', 
 	'https://red.zottel.red',
 	'https://red.pixelbits.de',
-	'https://whogotzot.com'
+	'https://my.federated.social',
+	'https://whogotzot.com',
+	'https://redmatrix.nl'
 );
 
 
@@ -471,7 +472,6 @@ define ( 'ACTIVITY_FAVORITE',    NAMESPACE_ACTIVITY_SCHEMA . 'favorite' );
 
 define ( 'ACTIVITY_POKE',        NAMESPACE_ZOT . '/activity/poke' );
 define ( 'ACTIVITY_MOOD',        NAMESPACE_ZOT . '/activity/mood' );
-define ( 'ACTIVITY_FILE',        NAMESPACE_ZOT . '/activity/file' );
 
 define ( 'ACTIVITY_OBJ_COMMENT', NAMESPACE_ACTIVITY_SCHEMA . 'comment' );
 define ( 'ACTIVITY_OBJ_NOTE',    NAMESPACE_ACTIVITY_SCHEMA . 'note' );
@@ -485,6 +485,7 @@ define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_ZOT  . '/activity/tagterm' );
 define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_ZOT  . '/activity/profile' );
 define ( 'ACTIVITY_OBJ_THING',   NAMESPACE_ZOT  . '/activity/thing' );
 define ( 'ACTIVITY_OBJ_LOCATION',NAMESPACE_ZOT  . '/activity/location' );
+define ( 'ACTIVITY_OBJ_FILE',    NAMESPACE_ZOT  . '/activity/file' );
 
 /**
  * item weight for query ordering