From: Michael Vogel <icarus@dabo.de>
Date: Fri, 13 Jul 2012 21:47:21 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=95e6e5efd54d92a306fd430ef3ff594d0e79a0c3;p=friendica-addons.git

Merge remote branch 'upstream/master'

Conflicts:
	libertree/libertree.php
---

95e6e5efd54d92a306fd430ef3ff594d0e79a0c3
diff --cc libertree/libertree.php
index 4b55a5e7,0e7e1a81..fcd0fa5c
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@@ -194,10 -193,11 +193,11 @@@ function libertree_send(&$a,&$b) 
  		// Adding the title
  		if(strlen($title))
  			$body = "## ".html_entity_decode($title)."\n\n".$body;
 -		
 +
+ 
  		$params = array(
  			'text' => $body,
- 			'source' => "friendica"
+ 			'source' => $ltree_source
  		//	'token' => $ltree_api_token
  		);