Merge branch 'master' into newui

2011-08-22 13:56:08 +02:00
parent afdc639f17 564ade0685
commit d8bd4fbb3e
52 changed files with 3730 additions and 1673 deletions
--- a/view/theme/darkzero/style.css
+++ b/view/theme/darkzero/style.css
@@ -62,3 +62,7 @@ footer {
 }


+input#dfrn-url {
+	background-color: #222222;
+	color: #FFFFFF !important;
+}