Torsten Grote 630b4ff561 Merge branch '1832-mirror-remote-self-destruct-timer' into '804-self-destructing-messages' ...

Mirror the contact's changes to the self-destruct timer

See merge request briar/briar!1312

2020-12-04 14:59:15 +00:00

..

main/java/org/briarproject/briar

Merge branch '1832-mirror-remote-self-destruct-timer' into '804-self-destructing-messages'

2020-12-04 14:59:15 +00:00

test/java/org/briarproject/briar

Use Collections.sort() to satisfy Animal Sniffer.

2020-12-04 12:16:58 +00:00