aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorAndrew Manning <andrew@reticu.li>2016-03-23 21:17:23 -0400
committerAndrew Manning <andrew@reticu.li>2016-03-23 21:17:23 -0400
commit59827b6dfdcab85b65853f3ee75365bda057a993 (patch)
treedc1871d3cba25d9064192d206bf24b16780621ab /boot.php
parent61bef7d4b083c9c794469137798176b62c2f21cb (diff)
parentf200dd4395e1d0e2a6200844ec4827a943bf09ea (diff)
downloadvolse-hubzilla-59827b6dfdcab85b65853f3ee75365bda057a993.tar.gz
volse-hubzilla-59827b6dfdcab85b65853f3ee75365bda057a993.tar.bz2
volse-hubzilla-59827b6dfdcab85b65853f3ee75365bda057a993.zip
Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextual-help
Diffstat (limited to 'boot.php')
-rwxr-xr-xboot.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index feed4fc8e..4dcd4bc15 100755
--- a/boot.php
+++ b/boot.php
@@ -47,7 +47,7 @@ require_once('include/account.php');
define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')));
-define ( 'STD_VERSION', '1.3.1' );
+define ( 'STD_VERSION', '1.3.2' );
define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1165 );
@@ -271,9 +271,11 @@ define ( 'MENU_BOOKMARK', 0x0002 );
* Network and protocol family types
*/
-define ( 'NETWORK_DFRN', 'friendica-over-diaspora'); // Friendica, Mistpark, other DFRN implementations
+define ( 'NETWORK_FRND', 'friendica-over-diaspora'); // Friendica, Mistpark, other DFRN implementations
+define ( 'NETWORK_DFRN', 'dfrn'); // Friendica, Mistpark, other DFRN implementations
define ( 'NETWORK_ZOT', 'zot'); // Zot!
define ( 'NETWORK_OSTATUS', 'stat'); // status.net, identi.ca, GNU-social, other OStatus implementations
+define ( 'NETWORK_GNUSOCIAL', 'gnusoc'); // status.net, identi.ca, GNU-social, other OStatus implementations
define ( 'NETWORK_FEED', 'rss'); // RSS/Atom feeds with no known "post/notify" protocol
define ( 'NETWORK_DIASPORA', 'diaspora'); // Diaspora
define ( 'NETWORK_MAIL', 'mail'); // IMAP/POP