diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-03-11 20:22:28 +0100 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-03-11 20:22:28 +0100 |
| commit | d653e27e2dfc172fd66a0987312952d736aca3e7 (patch) | |
| tree | e0725ca5cf27fc4400a7566eebc0721528d69fd4 /view/theme/diabook/wall_item.tpl | |
| parent | ebdf4842184cc8d0576abe99b29650c6b6512167 (diff) | |
| parent | 1dad15a021cc5d03f4238ab77ff051fc0ca1e35e (diff) | |
| download | volse-hubzilla-d653e27e2dfc172fd66a0987312952d736aca3e7.tar.gz volse-hubzilla-d653e27e2dfc172fd66a0987312952d736aca3e7.tar.bz2 volse-hubzilla-d653e27e2dfc172fd66a0987312952d736aca3e7.zip | |
Merge commit 'upstream/master'
Conflicts:
view/theme/diabook/wall_item.tpl
view/theme/diabook/wallwall_item.tpl
Diffstat (limited to 'view/theme/diabook/wall_item.tpl')
| -rw-r--r-- | view/theme/diabook/wall_item.tpl | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl index 8c892fd2a..6cbab0a71 100644 --- a/view/theme/diabook/wall_item.tpl +++ b/view/theme/diabook/wall_item.tpl @@ -46,6 +46,10 @@ </div> <div class="wall-item-actions"> +<<<<<<< HEAD:view/theme/diabook/wall_item.tpl +======= + +>>>>>>> upstream/master:view/theme/diabook/wall_item.tpl <div class="wall-item-actions-social"> @@ -81,7 +85,11 @@ <a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a> {{ endif }} </div> +<<<<<<< HEAD:view/theme/diabook/wall_item.tpl <div class="wall-item-location">$item.location </div> +======= + <div class="wall-item-location">$item.location </div> +>>>>>>> upstream/master:view/theme/diabook/wall_item.tpl </div> </div> <div class="wall-item-bottom"> |