]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1701-curl-range
authorMichael <heluecht@pirati.ca>
Thu, 12 Jan 2017 07:25:44 +0000 (07:25 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 12 Jan 2017 07:25:44 +0000 (07:25 +0000)
commite67133ef5653448003ceac29147cda41a4c9e017
tree64af8acbbdab44bc872ccc91705f97ab2e6fc67e
parenta2debaa68a0606f6bf4856740b298f3f5cde17d2
parent63e2695d226d195c6a97e1045d6b174591dd2487
Merge remote-tracking branch 'upstream/develop' into 1701-curl-range

Conflicts:
mod/oexchange.php
mod/uimport.php
include/network.php
mod/oexchange.php
mod/uexport.php
mod/uimport.php