]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items
authorMichael Vogel <icarus@dabo.de>
Fri, 26 Dec 2014 17:07:37 +0000 (18:07 +0100)
committerMichael Vogel <icarus@dabo.de>
Fri, 26 Dec 2014 17:07:37 +0000 (18:07 +0100)
commita357ebd1019f1eb1f7dc7873f0094d2848a381ce
tree7adf4c6f433259f0d5db955423fa91470ed76be3
parentc15b7d8d04eb74bed9c76b60ae02937ce4299b6f
parentd87323c2bb54cd7e9b17a15e9926609ee07dc345
Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items