Merge branch 'develop' into 1703-worker-splitting · 5a6da8b447 - friendica - Fingerprint Software Git Repository

clones/friendica

Merge branch 'develop' into 1703-worker-splitting

This commit is contained in:

Michael Vogel

2017-03-21 16:38:59 +01:00

committed by

GitHub

parent f7b0c2082b 9c2c483996

commit 5a6da8b447

181 changed files with 4303 additions and 3483 deletions

									
										include/cron.php
									
		+1
		-1
	
												View File
												
				@@ -244,4 +244,4 @@ function cron_poll_contacts($argc, $argv) {

							}

						}

					}

				}

				}