]> git.mxchange.org Git - friendica.git/commit
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)
commitedfa7dbac2ff8ed054fce90cba40efcca6c85529
tree2c5e17fcd19506101dcfe9ba4ab044b426091da8
parentd89cd6569bac3d157870b478b41f72c8958ea382
parent7ad2dd65654f6b1cb17ae98e65c3e95528d29e30
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fix photos after permissions_sql change
  [privacy] rework latest fix
  remove stray debugging

* master: