aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/comix
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-04-07 18:35:29 +0200
committerMichael Vogel <icarus@dabo.de>2012-04-07 18:35:29 +0200
commitcb05801a9031254f5882038de07a3ee4d5f89dd0 (patch)
tree186d9d1a4c591ec23e0e5bbebd08301143b5c157 /view/theme/comix
parent7308dbae282194356c2e95936aecc15ea059f356 (diff)
parent0fa3b7f348c3deeb85cb5f5f9bd35ba47b0e92ee (diff)
downloadvolse-hubzilla-cb05801a9031254f5882038de07a3ee4d5f89dd0.tar.gz
volse-hubzilla-cb05801a9031254f5882038de07a3ee4d5f89dd0.tar.bz2
volse-hubzilla-cb05801a9031254f5882038de07a3ee4d5f89dd0.zip
Merge commit 'upstream/master'
Diffstat (limited to 'view/theme/comix')
-rw-r--r--[-rwxr-xr-x]view/theme/comix/comment_item.tpl0
-rw-r--r--[-rwxr-xr-x]view/theme/comix/search_item.tpl0
-rw-r--r--[-rwxr-xr-x]view/theme/comix/style.css0
-rw-r--r--[-rwxr-xr-x]view/theme/comix/theme.php0
-rw-r--r--[-rwxr-xr-x]view/theme/comix/wall_item.tpl0
-rw-r--r--[-rwxr-xr-x]view/theme/comix/wallwall_item.tpl0
6 files changed, 0 insertions, 0 deletions
diff --git a/view/theme/comix/comment_item.tpl b/view/theme/comix/comment_item.tpl
index 9c3facaff..9c3facaff 100755..100644
--- a/view/theme/comix/comment_item.tpl
+++ b/view/theme/comix/comment_item.tpl
diff --git a/view/theme/comix/search_item.tpl b/view/theme/comix/search_item.tpl
index dba289031..dba289031 100755..100644
--- a/view/theme/comix/search_item.tpl
+++ b/view/theme/comix/search_item.tpl
diff --git a/view/theme/comix/style.css b/view/theme/comix/style.css
index 534e79cf4..534e79cf4 100755..100644
--- a/view/theme/comix/style.css
+++ b/view/theme/comix/style.css
diff --git a/view/theme/comix/theme.php b/view/theme/comix/theme.php
index e2f7f4db3..e2f7f4db3 100755..100644
--- a/view/theme/comix/theme.php
+++ b/view/theme/comix/theme.php
diff --git a/view/theme/comix/wall_item.tpl b/view/theme/comix/wall_item.tpl
index dfcd8ca96..dfcd8ca96 100755..100644
--- a/view/theme/comix/wall_item.tpl
+++ b/view/theme/comix/wall_item.tpl
diff --git a/view/theme/comix/wallwall_item.tpl b/view/theme/comix/wallwall_item.tpl
index abd5967b2..abd5967b2 100755..100644
--- a/view/theme/comix/wallwall_item.tpl
+++ b/view/theme/comix/wallwall_item.tpl