]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1510-contact-menu
authorMichael Vogel <icarus@dabo.de>
Sun, 11 Oct 2015 03:11:46 +0000 (05:11 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 11 Oct 2015 03:11:46 +0000 (05:11 +0200)
commit48309a25eccbd15ec02a62bda116c721859b53fe
tree7a3338e4d401b318afb7964c6104f925ff9a4039
parentbb0dff2c755a49717a56bf69473b526c1d7871b5
parent27fa20ab228e47a7e5400a2cc61ada6f5ea34799
Merge remote-tracking branch 'upstream/develop' into 1510-contact-menu

Conflicts:
include/conversation.php
include/conversation.php
mod/dirfind.php