diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-05-13 17:07:12 -0700 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-13 17:07:12 -0700 |
commit | 475dc7b686d6939d88c79dd58df1ff751356a922 (patch) | |
tree | 1271d12c627d8bd3826119df08e9d2c9477be3aa /include/api.php | |
parent | 4ca06ebd79b5258c5cb6ccb0871d98c9180f91b2 (diff) | |
parent | c82082d2bbb00294d62330d577dcdbc9ec6b9d1c (diff) | |
download | volse-hubzilla-475dc7b686d6939d88c79dd58df1ff751356a922.tar.gz volse-hubzilla-475dc7b686d6939d88c79dd58df1ff751356a922.tar.bz2 volse-hubzilla-475dc7b686d6939d88c79dd58df1ff751356a922.zip |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
boot.php
include/api.php
include/enotify.php
Diffstat (limited to 'include/api.php')
-rw-r--r-- | include/api.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/api.php b/include/api.php index 7fea00d81..a99ec8c0d 100644 --- a/include/api.php +++ b/include/api.php @@ -1936,7 +1936,7 @@ require_once('include/items.php'); 'private' => $private, 'textlimit' => $textlimit, 'sslserver' => $sslserver, 'ssl' => $ssl, 'shorturllength' => '30', 'hubzilla' => array( - 'RED_PLATFORM' => RED_PLATFORM, + 'PLATFORM_NAME' => PLATFORM_NAME, 'RED_VERSION' => RED_VERSION, 'ZOT_REVISION' => ZOT_REVISION, 'DB_UPDATE_VERSION' => DB_UPDATE_VERSION |