harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Browse Source 
Conflicts:
	boot.php
	include/api.php
	include/enotify.php
This commit is contained in:
redmatrix
2015-05-13 17:07:12 -07:00
parent 4ca06ebd79 c82082d2bb
commit 475dc7b686
13 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/api.php
View File

@@ -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