]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e9d5e0 82f2bfe)
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)
* 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:


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.