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

This commit is contained in:
danielvincent 2010-07-23 20:12:37 -07:00
commit 7eb59a654c

View file

@ -10,9 +10,10 @@
= linked_scaled_photo @photo, @album = linked_scaled_photo @photo, @album
#photo_pagination #photo_pagination
= link_to_prev @photo, @album %center
| = link_to_prev @photo, @album
= link_to_next @photo, @album |
= link_to_next @photo, @album
-if mine?(@photo) -if mine?(@photo)
%p %p