diff options
| author | Olivier van Helden <olivier@van-helden.net> | 2014-12-03 23:49:28 -0400 |
|---|---|---|
| committer | Olivier van Helden <olivier@van-helden.net> | 2014-12-03 23:49:28 -0400 |
| commit | 4d1a0cd35ee1420a913dc465d9e2466338eee8f1 (patch) | |
| tree | b873cdd6e87aa601a63bf0f2ba640107daa00d65 | |
| parent | bbd5cb736787157c0c7f78c7b103ff746d7caf5c (diff) | |
| parent | 7ad022ef7ae955c2481fb739cdd0b70c2c3dd480 (diff) | |
| download | volse-hubzilla-4d1a0cd35ee1420a913dc465d9e2466338eee8f1.tar.gz volse-hubzilla-4d1a0cd35ee1420a913dc465d9e2466338eee8f1.tar.bz2 volse-hubzilla-4d1a0cd35ee1420a913dc465d9e2466338eee8f1.zip | |
Merge pull request #2 from friendica/master
Pull from friendica/master
| -rwxr-xr-x | boot.php | 3 | ||||
| -rw-r--r-- | mod/connedit.php | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -75,7 +75,8 @@ $DIRECTORY_FALLBACK_SERVERS = array( 'https://zotid.net', 'https://redmatrix.nl', 'https://red.zottel.red', - 'https://red.pixelbits.de' + 'https://red.pixelbits.de', + 'https://whogotzot.com' ); diff --git a/mod/connedit.php b/mod/connedit.php index fbc2c8c33..5bf9c130b 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -504,7 +504,7 @@ function connedit_content(&$a) { $slider_tpl = get_markup_template('contact_slider.tpl'); $slide = replace_macros($slider_tpl,array( '$me' => t('Me'), - '$min' => 1, + '$min' => 1, '$val' => (($contact['abook_closeness']) ? $contact['abook_closeness'] : 99), '$intimate' => t('Best Friends'), '$friends' => t('Friends'), |