diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-03 08:05:53 -0500 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-03 08:05:53 -0500 |
commit | ba284044707e0f66fed98c711b9262bd623a0d42 (patch) | |
tree | 8f9bfbf8047d65ef8691b9353d1124aeed765129 /library/HTMLPurifier/Injector/AutoParagraph.php | |
parent | 7ef861907e32cd3d01877c0fdf8e2544f4f659b1 (diff) | |
parent | 8ffe15fbb1290fac839189f2de337efec223c5e1 (diff) | |
download | volse-hubzilla-ba284044707e0f66fed98c711b9262bd623a0d42.tar.gz volse-hubzilla-ba284044707e0f66fed98c711b9262bd623a0d42.tar.bz2 volse-hubzilla-ba284044707e0f66fed98c711b9262bd623a0d42.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
fix text-editor in theme
german strings as of 28th Feb from transilex
small fix in style.css
fix star/unstar
fixes in wall_item.tpl and style.css in theme diabook
fix in wall_item.tpl new icon link.png
add diabook to default themes
fixed broken tags and notifications in theme
* master:
Diffstat (limited to 'library/HTMLPurifier/Injector/AutoParagraph.php')
0 files changed, 0 insertions, 0 deletions