Merge branch 'master' of github.com:diaspora/diaspora_rails
This commit is contained in:
commit
7eb59a654c
1 changed files with 4 additions and 3 deletions
|
|
@ -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
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue