Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

Browse source

* 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:

Simon L'nu 2012-05-29 15:06:22 -04:00

parent 2eafa9a475

commit 5edc6735b7

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available