]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Fri, 4 May 2012 21:03:23 +0000 (17:03 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Fri, 4 May 2012 21:03:23 +0000 (17:03 -0400)
commit5830c32dceb2429656ee4957690dd78c24641f02
treef71428787e701421068ce53e446bed47b7078fcf
parent00190b7faab2baf21523a7243268057142f6de88
parent37d4181fde392b5d31d77531255b345d9a0e718b
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  category removal
  Esperanto 100%
  "show more" friends in common

* master: