diff options
author | friendica <info@friendica.com> | 2015-01-26 18:27:03 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2015-01-26 18:27:03 -0800 |
commit | ac594183c6fdc6cf4d5a2a29ade7478a17336397 (patch) | |
tree | d38f73727da4d8697b00d2102ae10b501d1909ce /mod/viewconnections.php | |
parent | e6bfe3f2c10e851ed5ba49886ec8d0a9a9de2296 (diff) | |
parent | 9f5bfca28dde23893156ad36682e20ca2fc0dd45 (diff) | |
download | volse-hubzilla-ac594183c6fdc6cf4d5a2a29ade7478a17336397.tar.gz volse-hubzilla-ac594183c6fdc6cf4d5a2a29ade7478a17336397.tar.bz2 volse-hubzilla-ac594183c6fdc6cf4d5a2a29ade7478a17336397.zip |
Merge branch 'master' into tres and add some work on the item_deleted flag refactor
Conflicts:
include/attach.php
include/onedirsync.php
include/zot.php
mod/locs.php
Diffstat (limited to 'mod/viewconnections.php')
-rw-r--r-- | mod/viewconnections.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/viewconnections.php b/mod/viewconnections.php index d4731d8c4..e97c77e76 100644 --- a/mod/viewconnections.php +++ b/mod/viewconnections.php @@ -82,7 +82,7 @@ function viewconnections_content(&$a) { $tpl = get_markup_template("viewcontact_template.tpl"); $o .= replace_macros($tpl, array( - '$title' => t('View Connnections'), + '$title' => t('View Connections'), '$contacts' => $contacts, '$paginate' => paginate($a), )); |