aboutsummaryrefslogtreecommitdiffstats
path: root/src/free/java/eu/siacs
diff options
context:
space:
mode:
authorAndreas Straub <andy@strb.org>2015-07-15 15:45:12 +0200
committerAndreas Straub <andy@strb.org>2015-07-15 16:34:55 +0200
commitcbfd07d58077efb8fda7a0beae09cad3931a3030 (patch)
treef4f4ce58b3a15fe53fe607dbfe89765d21cc810d /src/free/java/eu/siacs
parent235c9039e010e26bf3046fd2ae36b4d45c39cf8e (diff)
Don't merge messages with different trust statuses
Diffstat (limited to 'src/free/java/eu/siacs')
0 files changed, 0 insertions, 0 deletions