diff options
| author | Habeas Codice <habeascodice@federated.social> | 2015-01-21 21:27:07 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2015-01-21 21:27:07 -0800 |
| commit | c05f0ec40784a17de2e675c4d684d3a0c54228b0 (patch) | |
| tree | fdab07506568d57c9abbac72511c5c04ea46f2fd /boot.php | |
| parent | 6d291d880e14c0489277fd670f235bdb60bcfcd5 (diff) | |
| parent | 7d0e0366b946093f81e1ea4e358697fe5a22be64 (diff) | |
| download | volse-hubzilla-c05f0ec40784a17de2e675c4d684d3a0c54228b0.tar.gz volse-hubzilla-c05f0ec40784a17de2e675c4d684d3a0c54228b0.tar.bz2 volse-hubzilla-c05f0ec40784a17de2e675c4d684d3a0c54228b0.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'boot.php')
| -rwxr-xr-x | boot.php | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -83,7 +83,9 @@ $DIRECTORY_FALLBACK_SERVERS = array( 'https://zotid.net', 'https://red.zottel.red', 'https://red.pixelbits.de', - 'https://whogotzot.com' + 'https://my.federated.social', + 'https://whogotzot.com', + 'https://redmatrix.nl' ); @@ -500,7 +502,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' ); @@ -514,6 +515,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 |