diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-02-27 00:56:41 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-02-27 00:56:41 -0500 |
| commit | 36d173ca98f8f95bb14e58562004cdcf07c47183 (patch) | |
| tree | e216e1fa6007b8bbe4aa994cb7c9a7db6d8a23b9 /mod/smilies.php | |
| parent | fc036210fb599cff936b647689362ebacf86a16b (diff) | |
| download | volse-hubzilla-36d173ca98f8f95bb14e58562004cdcf07c47183.tar.gz volse-hubzilla-36d173ca98f8f95bb14e58562004cdcf07c47183.tar.bz2 volse-hubzilla-36d173ca98f8f95bb14e58562004cdcf07c47183.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: (29 commits)
spam db
fix tag icon size
typo in css
tagging missing from wallwall and a couple of themes, star missing from dispy
Mail: New options for actions after importing mails.
relative link redirects
Avoid some notices
Bugfix
is not always defined; but if defined, then always of type integer
1 Bugfix (missing $ character) and avoid some notices
necessare fields not loaded from DB
should probably be a->user['hidewall'] instead of profile['hidewall']
"Vier-Theme" Some more design stuff.
some revision to the German strings
German strings
Wrong variable name
show experimental and unsupported theme status on theme admin page
jumping divs with no scrolling
imrpove contrast on darkzero blockquotes
darkzero-NS theme
...
* master:
Diffstat (limited to 'mod/smilies.php')
0 files changed, 0 insertions, 0 deletions