Merge branch 'master' into develop

This commit is contained in:
Tobias Diekershoff 2019-01-21 10:04:26 +01:00
commit 08206fdcc0
29 changed files with 135 additions and 133 deletions

View file

@ -30,7 +30,6 @@ use Friendica\Util\XML;
require 'addon/pumpio/oauth/http.php';
require 'addon/pumpio/oauth/oauth_client.php';
require_once 'include/enotify.php';
require_once "mod/share.php";
define('PUMPIO_DEFAULT_POLL_INTERVAL', 5); // given in minutes