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

2010-06-30 00:27:30 -07:00 · 2010-06-30 00:27:30 -07:00 · 6bc68fb42e
commit 6bc68fb42e
parent dc5b321b62 a15cd932b6
3 changed files with 2 additions and 0 deletions
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@ -9,3 +9,4 @@
    = hidden_field_tag "user_email", "#{User.first.email}", :name => "user[email]"
    = f.submit "Sign in"
 /= render :partial => "devise/shared/links"
+
--- a/public/images/black_dandy.jpeg
+++ b/public/images/black_dandy.jpeg
--- a/public/stylesheets/sass/sessions.sass
+++ b/public/stylesheets/sass/sessions.sass
@ -32,3 +32,4 @@ input
  :top 30%
  :text
    :align center
+