]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1505-ostatus
authorMichael Vogel <icarus@dabo.de>
Fri, 29 May 2015 08:55:07 +0000 (10:55 +0200)
committerMichael Vogel <icarus@dabo.de>
Fri, 29 May 2015 08:55:07 +0000 (10:55 +0200)
commit594f3e28159d30f22ea2ce2147faf3eebdcbffa3
tree1a2e045fa5a19658ba948ee73b7e944674d3373b
parentb763c810fb02ba322e9232bfd23da3a04ecd271e
parent9a22b4818e0a406c89ff1cc84be4232c8a979f78
Merge remote-tracking branch 'upstream/develop' into 1505-ostatus