clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1701-curl-range

Browse Source 
Conflicts:
	mod/oexchange.php
	mod/uimport.php
This commit is contained in:
Michael
2017-01-12 07:25:44 +00:00
parent a2debaa68a 63e2695d22
commit e67133ef56
162 changed files with 798 additions and 757 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/network.php
View File

@@ -5,7 +5,6 @@
*/
use \Friendica\Core\Config;
use \Friendica\Core\PConfig;
require_once("include/xml.php");
require_once('include/Probe.php');