]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d56ec3 19bf0aa)
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)
* remotes/upstream/master:
  slackr - better highlighting of current selections
  slackr - knock the sharp edges off the events calendar
  rev update

* master:


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.