Merge branch 'master' into tres

This commit is contained in:
redmatrix
2015-05-17 19:49:36 -07:00
31 changed files with 612 additions and 421 deletions

View File

@@ -50,7 +50,7 @@ function home_content(&$a, $update = 0, $load = false) {
if(get_config('system','projecthome')) {
$o .= file_get_contents('assets/home.html');
$a->page['template'] = 'full';
$a->page['title'] = t('Hubzilla - "The Network"');
$a->page['title'] = t('$Projectname');
return $o;
}