Merge pull request #3445 from Hypolite/improvement/move-probe-to-src

author Michael Vogel <icarus@dabo.de>

Sun, 7 May 2017 21:14:22 +0000 (23:14 +0200)

committer GitHub <noreply@github.com>

Sun, 7 May 2017 21:14:22 +0000 (23:14 +0200)
author Michael Vogel <icarus@dabo.de>
Sun, 7 May 2017 21:14:22 +0000 (23:14 +0200)
committer GitHub <noreply@github.com>
Sun, 7 May 2017 21:14:22 +0000 (23:14 +0200)
diff --cc include/diaspora.php
Simple merge
diff --cc include/network.php
Simple merge
author	Michael Vogel <icarus@dabo.de>
	Sun, 7 May 2017 21:14:22 +0000 (23:14 +0200)
committer	GitHub <noreply@github.com>
	Sun, 7 May 2017 21:14:22 +0000 (23:14 +0200)
		1	2
include/diaspora.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/network.php	patch \|	diff1 \|	diff2 \|	blob \| history