git.mxchange.org Git - friendica.git/commit

]> git.mxchange.org Git - friendica.git/commit

projects / friendica.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: abe3fd7 974564f)

author	Michael <heluecht@pirati.ca>
	Sat, 16 Jul 2022 12:44:21 +0000 (12:44 +0000)
committer	Michael <heluecht@pirati.ca>
	Sat, 16 Jul 2022 12:44:21 +0000 (12:44 +0000)
commit	8b7cb5d9efeab580c2592e0fbe301f7142b73a3d
tree	0eb6166243301aad9e16fd216f0425710f73b9af	tree \| snapshot
parent	abe3fd7605872ba0d1376ef16b27319a80720f6f	commit \| diff
parent	974564f75edc682a8f76db88fd243e578c75f998	commit \| diff

Merge remote-tracking branch 'upstream/develop' into server-detection

src/Console/Relay.php	diff1 \|	diff2 \|	blob \| history
src/Model/APContact.php	diff1 \|	diff2 \|	blob \| history
src/Model/GServer.php	diff1 \|	diff2 \|	blob \| history
src/Util/Network.php	diff1 \|	diff2 \|	blob \| history
src/Util/ParseUrl.php	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.