Commit 247863c6 authored by Jonne Hass's avatar Jonne Hass

update diaspora-client

parent 8b141ed5
......@@ -173,7 +173,7 @@ GEM
faraday (0.7.0)
addressable (~> 2.2.4)
multipart-post (~> 1.1.0)
rack (>= 1.1.0, < 2)
rack (< 2, >= 1.1.0)
faraday-stack (0.1.3)
faraday (~> 0.6)
fastercsv (1.5.4)
......@@ -276,7 +276,7 @@ GEM
nokogiri (1.5.0)
oauth (0.4.5)
oauth2 (0.5.0)
faraday (>= 0.6.1, < 0.8)
faraday (< 0.8, >= 0.6.1)
multi_json (~> 1.0.0)
oauth2-provider (0.0.19)
activesupport (~> 3.0)
......@@ -394,7 +394,7 @@ GEM
simple_oauth (0.1.5)
sinatra (1.2.7)
rack (~> 1.1)
tilt (>= 1.2.2, < 2.0)
tilt (< 2.0, >= 1.2.2)
sqlite3 (1.3.5)
subexec (0.1.0)
systemu (2.2.0)
......
......@@ -460,8 +460,6 @@ ActiveRecord::Schema.define(:version => 20111207233503) do
t.string "confirm_email_token", :limit => 30
t.datetime "locked_at"
t.boolean "show_community_spotlight_in_stream", :default => true, :null => false
t.boolean "auto_follow_back", :default => false
t.integer "auto_follow_back_aspect_id"
end
add_index "users", ["authentication_token"], :name => "index_users_on_authentication_token", :unique => true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment