diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-06 21:33:56 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-06 21:33:56 -0500 |
| commit | edfa7dbac2ff8ed054fce90cba40efcca6c85529 (patch) | |
| tree | 2c5e17fcd19506101dcfe9ba4ab044b426091da8 /view/settings_nick_set.tpl | |
| parent | d89cd6569bac3d157870b478b41f72c8958ea382 (diff) | |
| parent | 7ad2dd65654f6b1cb17ae98e65c3e95528d29e30 (diff) | |
| download | volse-hubzilla-edfa7dbac2ff8ed054fce90cba40efcca6c85529.tar.gz volse-hubzilla-edfa7dbac2ff8ed054fce90cba40efcca6c85529.tar.bz2 volse-hubzilla-edfa7dbac2ff8ed054fce90cba40efcca6c85529.zip | |
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:
Diffstat (limited to 'view/settings_nick_set.tpl')
0 files changed, 0 insertions, 0 deletions