]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3388ad 7c6c3d3)
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)
* remotes/upstream/master:
  profile wall privacy
  don't expire filed items

* master:


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.