diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-06 14:51:14 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-06 14:51:14 -0500 |
| commit | d647dbc6af33689d0baf4bafd72031d06dcf7577 (patch) | |
| tree | afd4db159aa0b36bdb1e8f17581283843bd9bcd5 /view/netfriend.tpl | |
| parent | 2a3aaca88ded68a8ce926577d3faea2f3ef0ab50 (diff) | |
| parent | a9690dfe2d9358fcbb156644df2d12099ff798c4 (diff) | |
| download | volse-hubzilla-d647dbc6af33689d0baf4bafd72031d06dcf7577.tar.gz volse-hubzilla-d647dbc6af33689d0baf4bafd72031d06dcf7577.tar.bz2 volse-hubzilla-d647dbc6af33689d0baf4bafd72031d06dcf7577.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
remove "smilie" expansion for Diaspora logo
prevent duplicate likes
quattro: theme settings (a bit hackish)
add img
fixes in diabook
finalise spam storage model, begin driver changes.
fixes
template proc: add variable filters
* master:
Diffstat (limited to 'view/netfriend.tpl')
0 files changed, 0 insertions, 0 deletions