aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-09-29 23:37:16 -0700
committerfriendica <info@friendica.com>2014-09-29 23:37:16 -0700
commitcef570991a7ac43b8dbd4b48b900a33dfe2b8f9c (patch)
tree7ac819dbf510cf8543d9cd31bf4475e0d1e530a9 /view
parentf8468b4c3aeeb51f485c6bb7107f5b64a9643c85 (diff)
parent0283720302a372e4a00a5af6145bbbc39d52ebb9 (diff)
downloadvolse-hubzilla-cef570991a7ac43b8dbd4b48b900a33dfe2b8f9c.tar.gz
volse-hubzilla-cef570991a7ac43b8dbd4b48b900a33dfe2b8f9c.tar.bz2
volse-hubzilla-cef570991a7ac43b8dbd4b48b900a33dfe2b8f9c.zip
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view')
-rw-r--r--view/theme/redbasic/schema/simple_black_on_white.php (renamed from view/theme/redbasic/schema/simple: black on white.php)0
-rw-r--r--view/theme/redbasic/schema/simple_green_on_black.php (renamed from view/theme/redbasic/schema/simple: green on black.php)0
-rw-r--r--view/theme/redbasic/schema/simple_white_on_black.php (renamed from view/theme/redbasic/schema/simple: white on black.php)0
3 files changed, 0 insertions, 0 deletions
diff --git a/view/theme/redbasic/schema/simple: black on white.php b/view/theme/redbasic/schema/simple_black_on_white.php
index cdd85a129..cdd85a129 100644
--- a/view/theme/redbasic/schema/simple: black on white.php
+++ b/view/theme/redbasic/schema/simple_black_on_white.php
diff --git a/view/theme/redbasic/schema/simple: green on black.php b/view/theme/redbasic/schema/simple_green_on_black.php
index 3a1ea9134..3a1ea9134 100644
--- a/view/theme/redbasic/schema/simple: green on black.php
+++ b/view/theme/redbasic/schema/simple_green_on_black.php
diff --git a/view/theme/redbasic/schema/simple: white on black.php b/view/theme/redbasic/schema/simple_white_on_black.php
index 74d133038..74d133038 100644
--- a/view/theme/redbasic/schema/simple: white on black.php
+++ b/view/theme/redbasic/schema/simple_white_on_black.php