diff options
author | Andreas Straub <andy@strb.org> | 2015-07-15 15:45:12 +0200 |
---|---|---|
committer | Andreas Straub <andy@strb.org> | 2015-07-19 22:23:28 +0200 |
commit | e8ec2ee628076aa43132c3214b786ddde64f93a6 (patch) | |
tree | 69b2a4d3b926d37e49f3051a3afaf7bc2380854b /src/main/java/eu/siacs/conversations/services | |
parent | fca0c367576e4cd1f218c663ad2da6a1d4bfb392 (diff) |
Don't merge messages with different trust statuses
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services')
0 files changed, 0 insertions, 0 deletions