aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-05-29 15:06:22 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-05-29 15:06:22 -0400
commit5edc6735b77317fa6c54fc1ad4698cf9ebb2b744 (patch)
treeb0b1656b9b7c46f003e6910933d0f86b7a1fb6e3 /view
parent2eafa9a47519f9f35c5eb568cf4235c092c1dcce (diff)
downloadvolse-hubzilla-5edc6735b77317fa6c54fc1ad4698cf9ebb2b744.tar.gz
volse-hubzilla-5edc6735b77317fa6c54fc1ad4698cf9ebb2b744.tar.bz2
volse-hubzilla-5edc6735b77317fa6c54fc1ad4698cf9ebb2b744.zip
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:
Diffstat (limited to 'view')
0 files changed, 0 insertions, 0 deletions