]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Thu, 24 May 2012 09:28:40 +0000 (05:28 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Thu, 24 May 2012 09:28:40 +0000 (05:28 -0400)
* remotes/upstream/master:
  slackr: improve interactivity
  slackr: hide calendar when posting
  more theme stuff

* master:


No differences found