]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml
authorMichael Vogel <icarus@dabo.de>
Fri, 15 Jul 2016 18:12:46 +0000 (20:12 +0200)
committerMichael Vogel <icarus@dabo.de>
Fri, 15 Jul 2016 18:12:46 +0000 (20:12 +0200)
commitde6f48365bfa8745da49c2682913fa1a19ad9d55
treed0f983fb60c39c918ddc419771b7c07c688b6a08
parenta64b7704d8d3dedefd94a9e34410c39127eb7de5
parent0a49b7dc77048c2b46c030eb09906b0d82e65ba7
Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml