]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Wed, 23 May 2012 23:20:24 +0000 (19:20 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Wed, 23 May 2012 23:20:24 +0000 (19:20 -0400)
commit30b658c42903f703003c793e1ec04b10c9e09147
tree6831e687ce328444f839f9c5173a261d176eff87
parent1d56ec3c7a9736ace7e9e813b09e0cf5b6b0ccf3
parent19bf0aa28397ddbfd6637c855e7f400ff8deef35
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  slackr - better highlighting of current selections
  slackr - knock the sharp edges off the events calendar
  rev update

* master: