]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 2 Apr 2012 20:53:47 +0000 (16:53 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 2 Apr 2012 20:53:47 +0000 (16:53 -0400)
commit9cb3fc226a9246b36810338f0ee8a115738cc97b
treecfc4babf70100eda5a62a23c9a31b5666466c6c3
parent5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c
parent6dfd55668f39d2cfb27d468cc982471abaad5165
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-themes: css-fixes
  diabook-themes: fixes in js
  diabook-themes: fixed pageheader
  diabook-themes: bugfixes / css-fixes
  make the "new calendar" (javascript interactive) the default
  remove zrl from query string
  catch a couple more Oo smilies
  add page_content_top hook

* master: