]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import
authorMichael Vogel <icarus@dabo.de>
Wed, 27 Jan 2016 12:16:28 +0000 (13:16 +0100)
committerMichael Vogel <icarus@dabo.de>
Wed, 27 Jan 2016 12:16:28 +0000 (13:16 +0100)
commitaeecd83ade8dfea9565c30da329879a681b0fd4b
treedd728f25342a611cb830b71eb8c7842065e67629
parentafed5f3afc62431735b48a0ca6b5fb16ec598cf3
parentd6c1889a2039033b14a88cdb031461cadabf2114
Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import