]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d89cd65 7ad2dd6)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Wed, 7 Mar 2012 02:33:56 +0000 (21:33 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Wed, 7 Mar 2012 02:33:56 +0000 (21:33 -0500)
* remotes/upstream/master:
  fix photos after permissions_sql change
  [privacy] rework latest fix
  remove stray debugging

* master:


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