]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 27 Mar 2012 08:40:42 +0000 (04:40 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 27 Mar 2012 08:40:42 +0000 (04:40 -0400)
commitcc33a564e1658d32bb5bc3ad0abdfbe6871cf945
treefdeb88be9d8545ead92c5d63a9d9af7f6a7ccc23
parentc3388ad81336d45a40a66b69096f504ffa7e34cb
parent7c6c3d36f589d38de5e8b36f2ba1d940c8150e2c
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  profile wall privacy
  don't expire filed items

* master: