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

4
boot.php
View File

@@ -45,7 +45,7 @@ require_once('include/Contact.php');
require_once('include/account.php');
define ( 'RED_PLATFORM', 'hubzilla' );
define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R');
define ( 'ZOT_REVISION', 1 );
@@ -1013,7 +1013,7 @@ class App {
'$user_scalable' => $user_scalable,
'$baseurl' => $this->get_baseurl(),
'$local_channel' => local_channel(),
'$generator' => RED_PLATFORM . ' ' . RED_VERSION,
'$generator' => PLATFORM_NAME . ' ' . RED_VERSION,
'$update_interval' => $interval,
'$icon' => head_get_icon(),
'$head_css' => head_get_css(),