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

This commit is contained in:
maxwell 2010-06-14 17:48:50 -07:00
commit 3c3c194ed5

View file

@ -1,6 +1,6 @@
- title "New Friend"
- form_for @friend do |f|
= form_for @friend do |f|
= f.error_messages
%p
= f.label :username