Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: ability to only expire contacts, not self Provide backend option to only expire other peoples' conversations. more theme cleanup rev update * master:
This commit is contained in:
parent
2eafa9a475
commit
5edc6735b7