Michael Vogel 48309a25ec Merge remote-tracking branch 'upstream/develop' into 1510-contact-menu ...

Conflicts:
	include/conversation.php

2015-10-11 05:11:46 +02:00

5.0 KiB

Raw Blame History

View Raw