]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e2a9c9 283bc51)
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)
* 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:


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