From: Michael - piratica.eu <ike@piratenpartei.de>
Date: Sun, 20 Jan 2013 13:17:09 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/annando/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cc9ce39e3f1d7335de2124f78c5ecb02becd197c;p=friendica.git

Merge branch 'master' of https://github.com/annando/friendica

Conflicts:
	include/poller.php
---

cc9ce39e3f1d7335de2124f78c5ecb02becd197c
diff --cc include/poller.php
index cc5f2a9834,692335aab2..c9c46188f6
--- a/include/poller.php
+++ b/include/poller.php
@@@ -61,7 -61,11 +61,11 @@@ function poller_run(&$argv, &$argc)
  	// run queue delivery process in the background
  
  	proc_run('php',"include/queue.php");
 -	
 +
+ 	// run diaspora photo queue process in the background
+ 
+ 	proc_run('php',"include/dsprphotoq.php");
 -	
++
  	// expire any expired accounts
  
  	q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0