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

@@ -55,8 +55,8 @@ function notification($params) {
push_lang($recip['account_language']); // should probably have a channel language
$banner = t('Hubzilla Notification');
$product = t('hubzilla'); // PLATFORM_NAME;
$banner = t('$Projectname Notification');
$product = t('$projectname'); // PLATFORM_NAME;
$siteurl = $a->get_baseurl(true);
$thanks = t('Thank You,');
$sitename = get_config('system','sitename');