diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-24 19:38:54 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-24 19:38:54 -0400 |
| commit | 8a6c407282fe10f676f08f21e28647a5c8794e11 (patch) | |
| tree | b5a5bc5881bf5b35cdb52bb997498ef36a391720 /view/profile_photo.tpl | |
| parent | 803f79e0912c4a526a16fdda4809277d8ad3195d (diff) | |
| parent | 3ae43c24487450a749942ef4c3c19fa2a61461b6 (diff) | |
| download | volse-hubzilla-8a6c407282fe10f676f08f21e28647a5c8794e11.tar.gz volse-hubzilla-8a6c407282fe10f676f08f21e28647a5c8794e11.tar.bz2 volse-hubzilla-8a6c407282fe10f676f08f21e28647a5c8794e11.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
prevent duplicate friend suggestions
block filed items from deletion
add the bang
network filter is now a permission group
small fix in css
add right_aside to diabook-blue
add connectable services to right_aside
add PostIt to right_aside, fixes in css
* master:
Diffstat (limited to 'view/profile_photo.tpl')
0 files changed, 0 insertions, 0 deletions