diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-06 03:54:09 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-06 03:54:09 -0400 |
| commit | 43d5876e8b35d53a0bef5248c5d63e5bc209dbbf (patch) | |
| tree | 2f9d83d87682b16ac6ac949382ab566fdca48076 /view/theme/comix | |
| parent | b361bcea83140c28b5a5677905405de0ac102791 (diff) | |
| parent | afd2bf031eff688ae53e51f9199d025ca1935abe (diff) | |
| download | volse-hubzilla-43d5876e8b35d53a0bef5248c5d63e5bc209dbbf.tar.gz volse-hubzilla-43d5876e8b35d53a0bef5248c5d63e5bc209dbbf.tar.bz2 volse-hubzilla-43d5876e8b35d53a0bef5248c5d63e5bc209dbbf.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
update to the German strings
add network_tabs hook
pass autoname(0) test
rev update
added index to config and pconfig table changed config.php to use REPLACE instead of INSERT, this removes one db hit.
* 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 |