From: Michael Vogel <icarus@dabo.de>
Date: Sun, 11 Mar 2012 19:22:28 +0000 (+0100)
Subject: Merge commit 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d653e27e2dfc172fd66a0987312952d736aca3e7;p=friendica.git

Merge commit 'upstream/master'

Conflicts:

	view/theme/diabook/wall_item.tpl
	view/theme/diabook/wallwall_item.tpl
---

d653e27e2dfc172fd66a0987312952d736aca3e7
diff --cc view/theme/diabook/wall_item.tpl
index 8c892fd2a9,ebe40fd4ea..6cbab0a715
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@@ -46,6 -46,7 +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 -82,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&nbsp;</div>			
++=======
+ 			<div class="wall-item-location">$item.location&nbsp;</div>
++>>>>>>> upstream/master:view/theme/diabook/wall_item.tpl
  		</div>
  	</div>
  	<div class="wall-item-bottom">
diff --cc view/theme/diabook/wallwall_item.tpl
index 3b103745bb,e02e5a8bec..4f0a2e25fd
--- a/view/theme/diabook/wallwall_item.tpl
+++ b/view/theme/diabook/wallwall_item.tpl
@@@ -52,6 -52,7 +52,10 @@@
  
  		</div>
  		<div class="wall-item-actions">
++<<<<<<< HEAD:view/theme/diabook/wallwall_item.tpl
++=======
+ 
++>>>>>>> upstream/master:view/theme/diabook/wallwall_item.tpl
  			<div class="wall-item-actions-social">
  			
  			
@@@ -88,7 -89,6 +92,10 @@@
  				{{ endif }}
  			</div>
  			<div class="wall-item-location">$item.location&nbsp;</div>
++<<<<<<< HEAD:view/theme/diabook/wallwall_item.tpl
 +
++=======
++>>>>>>> upstream/master:view/theme/diabook/wallwall_item.tpl
  		</div>
  	</div>
  	<div class="wall-item-bottom">