diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-20 20:16:06 -0400 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-20 20:16:06 -0400 |
commit | 172aff1c2bb52f07e107bff2abbeea40a12aa5ae (patch) | |
tree | c6cba9ce7f1cd5b5dd25bda87de4615ab04c7e0a /view/settings_addons.tpl | |
parent | 8809e96310048518ffdcc0ffd6a7faed112ab17a (diff) | |
download | volse-hubzilla-172aff1c2bb52f07e107bff2abbeea40a12aa5ae.tar.gz volse-hubzilla-172aff1c2bb52f07e107bff2abbeea40a12aa5ae.tar.bz2 volse-hubzilla-172aff1c2bb52f07e107bff2abbeea40a12aa5ae.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
diabook-themes: add diabook-dark
diabook-themes: add diabook-green and some minor css/bug-fixes
rev update
escape email template var names. fix bug n385.
* master:
Diffstat (limited to 'view/settings_addons.tpl')
0 files changed, 0 insertions, 0 deletions