]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora
authorMichael Vogel <icarus@dabo.de>
Sun, 6 Mar 2016 07:41:24 +0000 (08:41 +0100)
committerMichael Vogel <icarus@dabo.de>
Sun, 6 Mar 2016 07:41:24 +0000 (08:41 +0100)
commit305f6f9a7b22b950f7e1408efc37b0d93d46cfd1
tree6c5f440401daed2e17e0dbcca7703a9c9079f31d
parent6468fbb9051ab6fe09bfcaaf0f46ce03491ace4f
parent6072e17a642deeafffd9eaefdac09063109435ec
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora