]> 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 14:15:20 +0000 (16:15 +0200)
committerMichael Vogel <icarus@dabo.de>
Fri, 15 Jul 2016 14:15:20 +0000 (16:15 +0200)
commit4e25d08a77f6a16fc701392d9e450b33b125fa32
treecd7cc544f9c0d3ad5eeeac3e819d34484e443b2d
parent6ebfbc59931b6b83411e5c53c235c6017e4e3f99
parent334db69d5d9e9ba726771755d4c920014f0c14d8
Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml
include/api.php