git.mxchange.org Git - friendica.git/commit - mod/crepair.php

]> git.mxchange.org Git - friendica.git/commit - mod/crepair.php

projects / friendica.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a2debaa 63e2695)

author	Michael <heluecht@pirati.ca>
	Thu, 12 Jan 2017 07:25:44 +0000 (07:25 +0000)
committer	Michael <heluecht@pirati.ca>
	Thu, 12 Jan 2017 07:25:44 +0000 (07:25 +0000)
commit	e67133ef5653448003ceac29147cda41a4c9e017
tree	64af8acbbdab44bc872ccc91705f97ab2e6fc67e	tree \| snapshot
parent	a2debaa68a0606f6bf4856740b298f3f5cde17d2	commit \| diff
parent	63e2695d226d195c6a97e1045d6b174591dd2487	commit \| diff

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

Conflicts:
mod/oexchange.php
mod/uimport.php

include/network.php	diff1 \|	diff2 \|	blob \| history
mod/oexchange.php	diff1 \|	diff2 \|	blob \| history
mod/uexport.php	diff1 \|	diff2 \|	blob \| history
mod/uimport.php	diff1 \|	diff2 \|	blob \| history

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