]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2eafa9a) | patch
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 29 May 2012 19:06:22 +0000 (15:06 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 29 May 2012 19:06:22 +0000 (15:06 -0400)
commit5edc6735b77317fa6c54fc1ad4698cf9ebb2b744
treeb0b1656b9b7c46f003e6910933d0f86b7a1fb6e3tree | snapshot
parent2eafa9a47519f9f35c5eb568cf4235c092c1dccecommit | diff
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:
Unnamed repository; edit this file 'description' to name the repository.