diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-01 21:38:33 -0400 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-01 21:38:33 -0400 |
commit | c96b40ab5fff900cf6cbec6f16f1b3e88116fe96 (patch) | |
tree | eaa1975b64864b340456fd16f47f99339c83ae39 /include/api.php | |
parent | f24ffa8ef0bbda13c12f130a413a8660fff45493 (diff) | |
download | volse-hubzilla-c96b40ab5fff900cf6cbec6f16f1b3e88116fe96.tar.gz volse-hubzilla-c96b40ab5fff900cf6cbec6f16f1b3e88116fe96.tar.bz2 volse-hubzilla-c96b40ab5fff900cf6cbec6f16f1b3e88116fe96.zip |
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:
Diffstat (limited to 'include/api.php')
0 files changed, 0 insertions, 0 deletions