aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-03-25 15:11:22 -0700
committerFriendika <info@friendika.com>2011-03-25 15:11:22 -0700
commitff8bddb4a87633405d8ecf37f2517fbf302ae1a7 (patch)
tree8217720174636c08ecb4c3033618416c3c2d1b90
parentf7928f15a8b3807f7571a8da78ed43cec34105d3 (diff)
parent9808b0378dbc03d78120bab275b3100eb5f85ccf (diff)
downloadvolse-hubzilla-ff8bddb4a87633405d8ecf37f2517fbf302ae1a7.tar.gz
volse-hubzilla-ff8bddb4a87633405d8ecf37f2517fbf302ae1a7.tar.bz2
volse-hubzilla-ff8bddb4a87633405d8ecf37f2517fbf302ae1a7.zip
Merge branch 'tobiasd-master'
-rw-r--r--addon/twitter/twitter.php2
-rw-r--r--view/theme/greenzero/style.css2
2 files changed, 2 insertions, 2 deletions
diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php
index bb424fb65..c59d1b9e5 100644
--- a/addon/twitter/twitter.php
+++ b/addon/twitter/twitter.php
@@ -138,7 +138,7 @@ function twitter_settings(&$a,&$s) {
* which the user can request a PIN to connect the account to a
* account at Twitter.
*/
- require_once('library/twitteroauth.php');
+ require_once('library/twitteroauth.php');
$connection = new TwitterOAuth($ckey, $csecret);
$request_token = $connection->getRequestToken();
$token = $request_token['oauth_token'];
diff --git a/view/theme/greenzero/style.css b/view/theme/greenzero/style.css
index 5a8401160..ec15b736e 100644
--- a/view/theme/greenzero/style.css
+++ b/view/theme/greenzero/style.css
@@ -2,7 +2,7 @@
/* green variation by Tobias Diekershoff <tobias.diekershoff@gmx.net> */
-a, a:visited { color: #549f4f; text-decoration: none; }
+a:link, a:visited { color: #549f4f; text-decoration: none; }
a:hover {text-decoration: underline; }