diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-26 14:18:39 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-26 14:18:39 -0400 |
| commit | a0ee51b3db99df7e8a0f9868937a9812177af567 (patch) | |
| tree | 25abf9edc4c47c4ee468627eb75a3a0dc6508ded /images/smiley-surprised.gif | |
| parent | 2d834d0f45125650a40363a4fb41afd05fc8de1e (diff) | |
| download | volse-hubzilla-a0ee51b3db99df7e8a0f9868937a9812177af567.tar.gz volse-hubzilla-a0ee51b3db99df7e8a0f9868937a9812177af567.tar.bz2 volse-hubzilla-a0ee51b3db99df7e8a0f9868937a9812177af567.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
add "similar interrest", "Friend Suggestions" and "Invite Friends" to right_aside, fixes in css
marking quattro-green as extension of quattro and deleting the tpl files
minor css fixes in diabook
screenshot for darkzero-NS, same as darkzero
added quaddro templates to quaddro-green
language issues in enotify
small fix in diabook :: add local friendica to right_aside
comix screenshot
diabook: small fix in theme_info array
more theme screenshots
themes: use duepuntozero tpls as default
* master:
Diffstat (limited to 'images/smiley-surprised.gif')
0 files changed, 0 insertions, 0 deletions