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

2010-08-18 20:59:18 -07:00 · 2010-08-18 20:59:18 -07:00 · 36c06349c5
commit 36c06349c5
parent 284601c6b1 d054162bbe
2 changed files with 2 additions and 2 deletions
--- a/app/views/posts/_debug.haml
+++ b/app/views/posts/_debug.haml
@ -1,6 +1,6 @@
 #debug_info
  %h5 DEBUG INFO
-  #debug_more{ :style => "display:none;" }
+  #debug_more
    %ul
      %li
        %b params
--- a/config/routes.rb
+++ b/config/routes.rb
@ -1,4 +1,4 @@
-Diaspora::Application.routes.draw do |map|
+Diaspora::Application.routes.draw do
  resources :people
  resources :users, :only => [:edit, :show, :update]
  resources :status_messages