Merge commit 'upstream/master'

Conflicts:

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

diff --cc view/theme/diabook/style.css
Simple merge

diff --cc view/theme/diabook/wall_item.tpl
index 8c892fd2a9db5f237bddce99702a0ce45894d2bf,ebe40fd4ea095f2e0b20cab4bdd4109d4f525d0b..6cbab0a715781296546bee25ff505167ec0ae223
--- 1/view/theme/diabook/wall_item.tpl
--- 2/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 3b103745bb757db445a51385df53abbe2c623011,e02e5a8becc6ca942cb40daaa9c46572cb562d66..4f0a2e25fd189f142dbb2c0a0c8a355505fd69df
--- 1/view/theme/diabook/wallwall_item.tpl
--- 2/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">