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

This commit is contained in:
ilya 2010-07-20 13:31:06 -07:00
commit 0f95b93bab

View file

@ -42,7 +42,6 @@
= form_for Photo.new, :html => {:multipart => true} do |f|
= f.error_messages
%p
%label{:for => "image_form"} Image
= f.file_field :image
%p
= f.submit 'post it!', :class => 'button'