Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

Browse source

* remotes/upstream/master:
  improve handling of relative feed url's
  convert html entities to utf-8 before email header encoding
  More Diabook-dark touch-ups.  Should *really* be useable this time...with editplain anyway.
  modified:   images/smiley-thumbsup.gif
  diabook-themes: small fix at "community pages"-box
  link socgraph to zrls
  adding zrl support to social graphs

* master:

...

This commit is contained in:

Simon L'nu 2012-05-01 21:38:33 -04:00

parent f24ffa8ef0

commit c96b40ab5f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available