Raphael Sofaer 1af945de11 Merge branch 'master' into oauth ... Conflicts: Gemfile Gemfile.lock app/models/app_config.rb app/models/post.rb db/schema.rb public/stylesheets/sass/application.sass spec/lib/webfinger_spec.rb		2011-06-28 17:13:38 -07:00
..
facebook_spec.rb	Merge branch 'master' into oauth	2011-06-28 17:13:38 -07:00
tumblr_spec.rb	Tumblr service swallows exceptions raised by tumblbeasts.	2011-06-04 20:45:09 -07:00
twitter_spec.rb	Specs passing with text	2011-03-14 11:39:31 -07:00