]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1612-diaspora
authorMichael <heluecht@pirati.ca>
Thu, 29 Dec 2016 23:29:01 +0000 (23:29 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 29 Dec 2016 23:29:01 +0000 (23:29 +0000)
commit5222bd22645d782fb1ae0cc161879e7c1edf938e
tree48011bb64b97c59184425a3d3348ada071faba70
parent94977cca181c28c2d3616bddb0d983c9630f0083
parent51155d7716da454d74366be3aec557eb7117e308
Merge remote-tracking branch 'upstream/develop' into 1612-diaspora