]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Fri, 27 Apr 2012 08:15:27 +0000 (04:15 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Fri, 27 Apr 2012 08:15:27 +0000 (04:15 -0400)
commit014e832db0ab9455adc400e892b7c8a5e2092948
treeec3b3d087b65298ccdc0e1acd51fde9d02a805d7
parent153534bc700e95bd3c248a1e094319dbf57ca297
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fix view contacts

* master: