aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/comix-plain
diff options
context:
space:
mode:
authorAlexander Kampmann <programmer@nurfuerspam.de>2012-04-05 13:39:15 +0200
committerAlexander Kampmann <programmer@nurfuerspam.de>2012-04-05 13:39:15 +0200
commit355c42cb309eb1313097411067ca999b699aa620 (patch)
treed00d1af9dceecdf114cadff924c5ba4a864fbf43 /view/theme/comix-plain
parentcbf4544887c7f496f2b2312727fe7bcb64a6d6c8 (diff)
parent9b6e91086b29554fd04362f6c87ea148718e8b1c (diff)
downloadvolse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.gz
volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.bz2
volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.zip
Merge branch 'master' of https://github.com/friendica/friendica
Conflicts: include/config.php update.php
Diffstat (limited to 'view/theme/comix-plain')
-rw-r--r--[-rwxr-xr-x]view/theme/comix-plain/comment_item.tpl0
-rw-r--r--view/theme/comix-plain/screenshot.jpgbin0 -> 323812 bytes
-rw-r--r--[-rwxr-xr-x]view/theme/comix-plain/search_item.tpl0
-rw-r--r--[-rwxr-xr-x]view/theme/comix-plain/style.css0
-rw-r--r--[-rwxr-xr-x]view/theme/comix-plain/theme.php0
-rw-r--r--[-rwxr-xr-x]view/theme/comix-plain/wall_item.tpl0
-rw-r--r--[-rwxr-xr-x]view/theme/comix-plain/wallwall_item.tpl0
7 files changed, 0 insertions, 0 deletions
diff --git a/view/theme/comix-plain/comment_item.tpl b/view/theme/comix-plain/comment_item.tpl
index 9c3facaff..9c3facaff 100755..100644
--- a/view/theme/comix-plain/comment_item.tpl
+++ b/view/theme/comix-plain/comment_item.tpl
diff --git a/view/theme/comix-plain/screenshot.jpg b/view/theme/comix-plain/screenshot.jpg
new file mode 100644
index 000000000..80e66e312
--- /dev/null
+++ b/view/theme/comix-plain/screenshot.jpg
Binary files differ
diff --git a/view/theme/comix-plain/search_item.tpl b/view/theme/comix-plain/search_item.tpl
index dba289031..dba289031 100755..100644
--- a/view/theme/comix-plain/search_item.tpl
+++ b/view/theme/comix-plain/search_item.tpl
diff --git a/view/theme/comix-plain/style.css b/view/theme/comix-plain/style.css
index 1a89cae7c..1a89cae7c 100755..100644
--- a/view/theme/comix-plain/style.css
+++ b/view/theme/comix-plain/style.css
diff --git a/view/theme/comix-plain/theme.php b/view/theme/comix-plain/theme.php
index be3180dc9..be3180dc9 100755..100644
--- a/view/theme/comix-plain/theme.php
+++ b/view/theme/comix-plain/theme.php
diff --git a/view/theme/comix-plain/wall_item.tpl b/view/theme/comix-plain/wall_item.tpl
index dfcd8ca96..dfcd8ca96 100755..100644
--- a/view/theme/comix-plain/wall_item.tpl
+++ b/view/theme/comix-plain/wall_item.tpl
diff --git a/view/theme/comix-plain/wallwall_item.tpl b/view/theme/comix-plain/wallwall_item.tpl
index abd5967b2..abd5967b2 100755..100644
--- a/view/theme/comix-plain/wallwall_item.tpl
+++ b/view/theme/comix-plain/wallwall_item.tpl