]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sat, 19 May 2012 06:59:40 +0000 (02:59 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sat, 19 May 2012 06:59:40 +0000 (02:59 -0400)
commit2cee9ec5c830098b5c57ae0c3d2a3d4e6697bce2
tree5ab08718ea4230918eeaa17f0d69d07faed082ff
parent83f0807e59b5be288374a825d1e4f75869d515de
parent4133df62234cc3466f34b8a7d52147a1e422bbc0
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  profile change activity link bug

* master: