]> git.mxchange.org Git - friendica.git/commit
Merge commit 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Wed, 11 Apr 2012 17:35:51 +0000 (19:35 +0200)
committerMichael Vogel <icarus@dabo.de>
Wed, 11 Apr 2012 17:35:51 +0000 (19:35 +0200)
commitee714daf4d33f8258e1301438423fc10a3bdc916
treee3da18226db88c42819e2f29b67763581eb1c293
parentc88c2515e43f7a446a9b358fb657290a8a6c847a
parenta1d5026abf129fc520327881a293d17c1ab21eff
Merge commit 'upstream/master'
include/conversation.php