diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-10 22:51:29 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-10 22:51:29 -0400 |
| commit | ae9506f21e90c052248c1dd77c929990883dfd54 (patch) | |
| tree | a070d276108b1e4d1fc31acd5102de9a872c0b78 /images/unlock_icon.gif | |
| parent | 640f258f187674e037655ee461ea483c7c92ef23 (diff) | |
| download | volse-hubzilla-ae9506f21e90c052248c1dd77c929990883dfd54.tar.gz volse-hubzilla-ae9506f21e90c052248c1dd77c929990883dfd54.tar.bz2 volse-hubzilla-ae9506f21e90c052248c1dd77c929990883dfd54.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
cleanup photo menus
more backend work on mail2 followers
make editplain work everywhere
move all fix_mce to one function so it can easily be undone
duplicate community posts
fix_mce_lf contact edit page
fix_mce_lf on profiles
set default on get_avatar
rev update
Incorrect tranlation (one negation too much)
fixed install bug
diabook-themes: smal fix in bbcode-js
diabook-themes: added url and quote to bbcode toolbar under comment box
Remove Gravatar from core and add new hook avatar_lookup.
Rename gravatar_img() more generic to avatar_img().
* master:
Diffstat (limited to 'images/unlock_icon.gif')
0 files changed, 0 insertions, 0 deletions