]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sat, 17 Mar 2012 00:26:38 +0000 (20:26 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sat, 17 Mar 2012 00:26:38 +0000 (20:26 -0400)
commit6bc2d58a98d2756b16b4a6bdf2997348d0d65883
tree846aacbf5ceb7fc9c97ba4cf3891461f8122cfd1
parent0e9d5e0ce869a75498e1f5eff847b6037d6c1f67
parent82f2bfea5bbf7c35450eb8fe9ee119e0b00d3d61
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: