Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts: include/zot.php
2015-07-02 22:00:15 -07:00
parent 1a5898bf80 065a50c920
commit 90a31f4ad5
6 changed files with 143 additions and 2 deletions
--- a/include/zot.php
+++ b/include/zot.php
@@ -2907,7 +2907,6 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
 						$abook['abook_feed'] = 1;
 				}

-
 				$clean = array();
 				if($abook['abook_xchan'] && $abook['entry_deleted']) {
 					logger('process_channel_sync_delivery: removing abook entry for ' . $abook['abook_xchan']);