]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 19 Mar 2012 07:41:26 +0000 (03:41 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 19 Mar 2012 07:41:26 +0000 (03:41 -0400)
commit236eaf6ed09df34e62cf487712d909cb8a3b35d1
tree86518b59c0318d8057a1a8503c6354ebaa96dae3
parent5e2a9c99a64dc75dd70320859b093d132e823f1f
parent283bc51acf479eebd54145eb639c681980f6717b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Existing photos could not be used as profile photos anymore - should be fixed now. And some extra logging in the CSRF-Protection to make debugging easier
  community discovery cont., cleanup of DB debugging

* master: