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

Merge pull request #2 from friendica/master

Browse Source 
Pull from friendica/master
This commit is contained in:
Olivier van Helden 2014-12-03 23:49:28 -04:00
commit 4d1a0cd35e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
boot.php
View File

@ -75,7 +75,8 @@ $DIRECTORY_FALLBACK_SERVERS = array(
'https://zotid.net', 'https://zotid.net',
'https://redmatrix.nl', 'https://redmatrix.nl',
'https://red.zottel.red', 'https://red.zottel.red',
'https://red.pixelbits.de' 'https://red.pixelbits.de',
'https://whogotzot.com'
); );

2
mod/connedit.php
View File

@ -504,7 +504,7 @@ function connedit_content(&$a) {
$slider_tpl = get_markup_template('contact_slider.tpl'); $slider_tpl = get_markup_template('contact_slider.tpl');
$slide = replace_macros($slider_tpl,array( $slide = replace_macros($slider_tpl,array(
'$me' => t('Me'), '$me' => t('Me'),
'$min' => 1, '$min' => 1,
'$val' => (($contact['abook_closeness']) ? $contact['abook_closeness'] : 99), '$val' => (($contact['abook_closeness']) ? $contact['abook_closeness'] : 99),
'$intimate' => t('Best Friends'), '$intimate' => t('Best Friends'),
'$friends' => t('Friends'), '$friends' => t('Friends'),