diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-19 03:41:26 -0400 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-19 03:41:26 -0400 |
commit | 236eaf6ed09df34e62cf487712d909cb8a3b35d1 (patch) | |
tree | 86518b59c0318d8057a1a8503c6354ebaa96dae3 /view/diaspora_message.tpl | |
parent | 5e2a9c99a64dc75dd70320859b093d132e823f1f (diff) | |
parent | 283bc51acf479eebd54145eb639c681980f6717b (diff) | |
download | volse-hubzilla-236eaf6ed09df34e62cf487712d909cb8a3b35d1.tar.gz volse-hubzilla-236eaf6ed09df34e62cf487712d909cb8a3b35d1.tar.bz2 volse-hubzilla-236eaf6ed09df34e62cf487712d909cb8a3b35d1.zip |
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:
Diffstat (limited to 'view/diaspora_message.tpl')
0 files changed, 0 insertions, 0 deletions