diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-07-22 06:32:36 +0200 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-07-22 06:32:36 +0200 |
| commit | 9cf9753190e8ff86c977ee696b55e6e3b0785c09 (patch) | |
| tree | 070ee8a4eae1e1636a50184e2e954fff7094c20c | |
| parent | 6b806708d9b8973ce57fb13fcdfe116c1409b9a0 (diff) | |
| parent | ba8fbb60dafee399389181b535ccc5060acd538c (diff) | |
| download | volse-hubzilla-9cf9753190e8ff86c977ee696b55e6e3b0785c09.tar.gz volse-hubzilla-9cf9753190e8ff86c977ee696b55e6e3b0785c09.tar.bz2 volse-hubzilla-9cf9753190e8ff86c977ee696b55e6e3b0785c09.zip | |
Merge github.com:tobiasd/friendika
| -rw-r--r-- | addon/impressum/impressum.php | 2 | ||||
| -rw-r--r-- | addon/piwik/piwik.php | 2 | ||||
| -rw-r--r-- | addon/statusnet/statusnet.php | 6 | ||||
| -rw-r--r-- | addon/twitter/twitter.php | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/addon/impressum/impressum.php b/addon/impressum/impressum.php index b93d9eef6..b760c7e0d 100644 --- a/addon/impressum/impressum.php +++ b/addon/impressum/impressum.php @@ -4,7 +4,7 @@ * Description: Plugin to add contact information to the about page (/friendika) * Version: 1.0 * Author: Tobias Diekershoff <https://diekershoff.homeunix.net/friendika/profile/tobias> - * License: 3-clause BSD license (same as Friendika) + * License: 3-clause BSD license */ function impressum_install() { diff --git a/addon/piwik/piwik.php b/addon/piwik/piwik.php index 3cc136d29..8389416e9 100644 --- a/addon/piwik/piwik.php +++ b/addon/piwik/piwik.php @@ -12,7 +12,7 @@ * Author: Tobias Diekershoff * tobias.diekershoff@gmx.net * - * License: 3-clause BSD license (same as Friendika) +* License: 3-clause BSD license * * Configuration: * Add the following two lines to your .htconfig.php file: diff --git a/addon/statusnet/statusnet.php b/addon/statusnet/statusnet.php index 63cdd28df..062884b96 100644 --- a/addon/statusnet/statusnet.php +++ b/addon/statusnet/statusnet.php @@ -10,7 +10,7 @@ * Author: Tobias Diekershoff * tobias.diekershoff@gmx.net * - * License:3-clause BSD license (same as Friendika) + * License:3-clause BSD license * * Configuration: * To activate the plugin itself add it to the $a->config['system']['addon'] @@ -155,8 +155,8 @@ function statusnet_settings_post ($a,$post) { goaway($a->get_baseurl().'/settings/addon'); } else { if (isset($_POST['statusnet-pin'])) { - // if the user supplied us with a PIN from Twitter, let the magic of OAuth happen - logger('got a StatusNet security code'); + // if the user supplied us with a PIN from Twitter, let the magic of OAuth happen + logger('got a StatusNet security code'); $api = get_pconfig(local_user(), 'statusnet', 'baseapi'); $ckey = get_pconfig(local_user(), 'statusnet', 'consumerkey' ); $csecret = get_pconfig(local_user(), 'statusnet', 'consumersecret' ); diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php index 7f2b2e1c7..26b324aca 100644 --- a/addon/twitter/twitter.php +++ b/addon/twitter/twitter.php @@ -11,7 +11,7 @@ * Author: Tobias Diekershoff * tobias.diekershoff@gmx.net * - * License:3-clause BSD license (same as Friendika) + * License:3-clause BSD license * * Configuration: * To use this plugin you need a OAuth Consumer key pair (key & secret) |