diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-16 20:26:38 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-16 20:26:38 -0400 |
| commit | 6bc2d58a98d2756b16b4a6bdf2997348d0d65883 (patch) | |
| tree | 846aacbf5ceb7fc9c97ba4cf3891461f8122cfd1 /view/album_edit.tpl | |
| parent | 0e9d5e0ce869a75498e1f5eff847b6037d6c1f67 (diff) | |
| parent | 82f2bfea5bbf7c35450eb8fe9ee119e0b00d3d61 (diff) | |
| download | volse-hubzilla-6bc2d58a98d2756b16b4a6bdf2997348d0d65883.tar.gz volse-hubzilla-6bc2d58a98d2756b16b4a6bdf2997348d0d65883.tar.bz2 volse-hubzilla-6bc2d58a98d2756b16b4a6bdf2997348d0d65883.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
convert boolean or int settings to strings to work around issues with template processing
add "send pm" link to photo dropdown for Diaspora contacts
* master:
Diffstat (limited to 'view/album_edit.tpl')
0 files changed, 0 insertions, 0 deletions