]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 5 Mar 2012 06:08:54 +0000 (01:08 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 5 Mar 2012 06:08:54 +0000 (01:08 -0500)
commit7de79a8c49e1cf601c0408883a02c6f6a13cd0db
treeb1e812feb9175b8e79d260de9a39d3a72a1fc87c
parentfe7a6b070d59ad1b9211ba0191e791c70cfeb90c
parent9c541dbd6748bea4c93c0a83f3dee6e9451049ea
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  like dislike button
  fixes in diabook

* master: