]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sat, 26 May 2012 05:23:17 +0000 (01:23 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sat, 26 May 2012 05:23:17 +0000 (01:23 -0400)
commit040d1467f356eb7a5d940b9cd779eb735b401794
tree4bbcd661b2029bc37bfcd2a6cf324d9a4b3fc7c7
parent25547cb21fff3f702a81abbeb5332094c020109e
parentf5290a5a107ef2d6c309c4a3205319c9b0d13994
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  missing entries on personal tab after sql text search optimise
  bug #434 - default group placement not working after accepting dfrn friend request
  fix wall_uploaded photo permissions on group post by member
  improve location change notifications
  keep private FB stuff out of personal notes
  rev update
  DE update to strings and templates

* master: