diff options
| author | zottel <github@zottel.net> | 2012-04-08 10:33:32 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-04-08 10:33:32 +0200 |
| commit | aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b (patch) | |
| tree | 1d7e5f2b575b8836fefe76660f466cb176585d5c /view/theme/comix | |
| parent | 64a1367525ac920721943a08adec1124657df70d (diff) | |
| parent | e3b2ac0735c908357dafb8670339fd34d3e2e6c0 (diff) | |
| download | volse-hubzilla-aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b.tar.gz volse-hubzilla-aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b.tar.bz2 volse-hubzilla-aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/theme/comix')
| -rw-r--r--[-rwxr-xr-x] | view/theme/comix/comment_item.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/theme/comix/search_item.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/theme/comix/style.css | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/theme/comix/theme.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/theme/comix/wall_item.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/theme/comix/wallwall_item.tpl | 0 |
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 |