Merge branch 'master' of https://github.com/friendica/friendica

Conflicts:
	include/config.php
	update.php

3 files changed, 0 insertions, 71 deletions

diff --git a/view/theme/darkness/style.css b/view/theme/darkness/style.css
deleted file mode 100755
index 3bc4c6aea..000000000
--- a/view/theme/darkness/style.css
+++ /dev/null
@@ -1,67 +0,0 @@
-@import url('../loozah/style.css');
-
-nav {
-	background: #CCC;
-}
-footer {
-	background: #CCC;
-}
-#banner {
-	color: #FF0000;
-}
-
-body { 
-	background: #000000;
-	color: #FF0000;
-}
-.nav-selected {
-	background: #000000 !important;
-	color: #888888 !important;
-}
-
-input:hover {
-	background-color: #800000;
-}
-input, select {
-	background-color: #000000;
-	color: #FF0000;
-}
-.nav-link:hover, .nav-commlink:hover, .tab:hover {
-	background: #DDDDDD;
-	color: #FF0000;
-}
-
-#logo-text a, #logo-text a:visited, #site-location {
-	color: #000000;
-}
-
-
-#page-footer {
-	border: none;
-}
-.nav-link {
-	color: #FF0000;
-	background: #444444;
-}
-
-.nav-commlink {
-	color: #FF0000;
-	background: #444444;
-}
-
-.tab {
-	color: #FF0000;
-	background: #444444;
-
-}
-
-a, a:visited, .fakelink, .fakelink:visited {
-	color: #888888;
-	text-decoration: none;
-}
-
-a:hover, .fakelink:hover {
-	color: #FF0000;
-	text-decoration: underline;
-}
-
diff --git a/view/theme/darkness/theme.php b/view/theme/darkness/theme.php
deleted file mode 100755
index 47b43cf13..000000000
--- a/view/theme/darkness/theme.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$a->theme_info = array(
-  'extends' => 'loozah',
-);
diff --git a/view/theme/darkness/unsupported b/view/theme/darkness/unsupported
deleted file mode 100644
index e69de29bb..000000000
--- a/view/theme/darkness/unsupported
+++ /dev/null