]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f0ddcb9) | patch
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)
commit3c153369840071fd7d5978b37a4c328f1c314564
tree0ee4ecab6a40eeaef7eebf9fb30187b8a4839808tree | snapshot
parentf0ddcb979bfe148c8cf238b278048b16f5645676commit | diff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  slackr: improve interactivity
  slackr: hide calendar when posting
  more theme stuff

* master:
Unnamed repository; edit this file 'description' to name the repository.