]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2eafa9a)
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)
* 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:


No differences found
Unnamed repository; edit this file 'description' to name the repository.