diff options
author | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-14 12:57:35 +0100 |
---|---|---|
committer | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-14 12:57:35 +0100 |
commit | 70709a882594250684c954a21d186877ea6f983c (patch) | |
tree | ee2f364e513f8fd9fa1e12da8f5cd39c36d9b403 /view/theme/diabook/wall_item.tpl | |
parent | 509ed2604fe6860b83e02984f8b4a280496a22a8 (diff) | |
parent | 42462cc1f00cd0d2e637ff3ddb62b30ae4a645c6 (diff) | |
download | volse-hubzilla-70709a882594250684c954a21d186877ea6f983c.tar.gz volse-hubzilla-70709a882594250684c954a21d186877ea6f983c.tar.bz2 volse-hubzilla-70709a882594250684c954a21d186877ea6f983c.zip |
Merge branch 'master' of git://github.com/friendica/friendica
Conflicts:
view/de/strings.php
Diffstat (limited to 'view/theme/diabook/wall_item.tpl')
-rw-r--r-- | view/theme/diabook/wall_item.tpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl index b1a014949..ebe40fd4e 100644 --- a/view/theme/diabook/wall_item.tpl +++ b/view/theme/diabook/wall_item.tpl @@ -46,7 +46,7 @@ </div> <div class="wall-item-actions"> - <div class="wall-item-location">$item.location </div> + <div class="wall-item-actions-social"> @@ -82,7 +82,7 @@ <a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a> {{ endif }} </div> - + <div class="wall-item-location">$item.location </div> </div> </div> <div class="wall-item-bottom"> |