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: a2532ad de2352e)

author	Michael <heluecht@pirati.ca>
	Sat, 2 Oct 2021 11:57:43 +0000 (11:57 +0000)
committer	Michael <heluecht@pirati.ca>
	Sat, 2 Oct 2021 11:57:43 +0000 (11:57 +0000)
commit	865006682a3952565035207898b80dfbd6d390b1
tree	6cbb9341d5414b64e9156a6674622724a791fafb	tree \| snapshot
parent	a2532ad7554602d631d9caabb5c74564328d1fff	commit \| diff
parent	de2352e34d5bb966db8a13c58204403f9d76391b	commit \| diff

Merge remote-tracking branch 'upstream/develop' into user-contact

include/api.php	diff1 \|	diff2 \|	blob \| history
src/Model/Contact.php	diff1 \|	diff2 \|	blob \| history
src/Module/Contact.php	diff1 \|	diff2 \|	blob \| history
src/Protocol/Feed.php	diff1 \|	diff2 \|	blob \| history
src/Protocol/OStatus.php	diff1 \|	diff2 \|	blob \| history
view/lang/C/messages.po	diff1 \|	diff2 \|	blob \| history

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