]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1706-diaspora2
authorMichael <heluecht@pirati.ca>
Fri, 16 Jun 2017 06:10:35 +0000 (06:10 +0000)
committerMichael <heluecht@pirati.ca>
Fri, 16 Jun 2017 06:10:35 +0000 (06:10 +0000)
commit5a11ef5b9066de5f2f262ca926c51aeb6285bb18
tree05bdcad43c8f30e79261120fd0d9a6a27659b46c
parent0dc1c932f8e403fc64c390b5887598758719fd3f
parentd2f2e1c371ca8cfaec5af3d59abb27138f590c76
Merge remote-tracking branch 'upstream/develop' into 1706-diaspora2