diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-06 18:26:22 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-06 18:26:22 -0500 |
| commit | a33ca0a7318cf727b5c605c381e4c6f20463ad3e (patch) | |
| tree | d9e51a0d8667cad5fcf3fc22cde9b7080ecb12a7 /images/smiley-surprised.gif | |
| parent | 94d4cad701ab6b618afb288c88165c0ec17ae238 (diff) | |
| parent | 1fae778421253b713c166f3e4d329997a9e214a3 (diff) | |
| download | volse-hubzilla-a33ca0a7318cf727b5c605c381e4c6f20463ad3e.tar.gz volse-hubzilla-a33ca0a7318cf727b5c605c381e4c6f20463ad3e.tar.bz2 volse-hubzilla-a33ca0a7318cf727b5c605c381e4c6f20463ad3e.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
search should be ok, but a little extra security won't hurt
messages-menu translation, add scroll-to-top and theme-bug-report in theme
Fixed...merged with mainline THEN added beards.
added beard smileys
doc/Account-Basics.md
doc/Account-Basics.md
a
doc/Remove-Account.md
doc/Making-Friends.md
doc/Bugs-and-Issues.md
doc/Account-Basics.md
* master:
Diffstat (limited to 'images/smiley-surprised.gif')
0 files changed, 0 insertions, 0 deletions