]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f24ffa8) | patch
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Wed, 2 May 2012 01:38:33 +0000 (21:38 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Wed, 2 May 2012 01:38:33 +0000 (21:38 -0400)
commitc96b40ab5fff900cf6cbec6f16f1b3e88116fe96
treeeaa1975b64864b340456fd16f47f99339c83ae39tree | snapshot
parentf24ffa8ef0bbda13c12f130a413a8660fff45493commit | diff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* 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:
Unnamed repository; edit this file 'description' to name the repository.