diff net-im/psi-plus/Manifest @ 437:061dcecdcd1e

resolved merge conflict
author Dirk Olmes <dirk@xanthippe.ping.de>
date Mon, 20 Mar 2017 07:20:37 +0100
parents 3360705cfae7 bf2801b18664
children e493bd4a6f5e
line wrap: on
line diff