]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import
authorMichael Vogel <icarus@dabo.de>
Sat, 30 Jan 2016 15:38:06 +0000 (16:38 +0100)
committerMichael Vogel <icarus@dabo.de>
Sat, 30 Jan 2016 15:38:06 +0000 (16:38 +0100)
commitd04e1bdf694207d1fc9d804dd38fa61f134a0255
treed1ddd7459033d46eec379ed556efbf13650de9bd
parent3ea5706d167df8e576bbe6ced0a4caa836f644e0
parent748d0e576c5b2b1247a9dd2d159ef3230d7562ad
Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import