]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Wed, 11 Apr 2012 03:34:55 +0000 (23:34 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Wed, 11 Apr 2012 03:34:55 +0000 (23:34 -0400)
commit75c7877986c118703839309268af14658c85f9b3
tree573cfb0509f3a4bf060db9f011b57024a530b001
parent2af41ee57bbe766229368376670c4ee3b528b2c4
parent0fa932853c76d8aca9fecf125d4c2d6816fb1a4a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  profile redir - goto correct profile page even if contact blocked, you just can't do anything.

* master: