nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
Sarah Mei 2010-11-09 06:54:02 -08:00
commit 4040ebfafa
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/shared/_stream_element.haml
View file

@ -20,7 +20,7 @@
- if current_user.owns?(post) - if current_user.owns?(post)
.right .right
= link_to t('delete'), photo_path(post), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete" = link_to t('delete'), object_path(post), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete"
= render type_partial(post), :post => post = render type_partial(post), :post => post

2
pkg

@ -1 +1 @@
Subproject commit 3bb1e77a05979a2af130515eea9ea7fceacaed2a Subproject commit 75ac12645e63f3c7533c2d0aaafbb685b1a45287