aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-03-16 20:26:38 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-03-16 20:26:38 -0400
commit6bc2d58a98d2756b16b4a6bdf2997348d0d65883 (patch)
tree846aacbf5ceb7fc9c97ba4cf3891461f8122cfd1 /view
parent0e9d5e0ce869a75498e1f5eff847b6037d6c1f67 (diff)
parent82f2bfea5bbf7c35450eb8fe9ee119e0b00d3d61 (diff)
downloadvolse-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')
0 files changed, 0 insertions, 0 deletions