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
..
_finder.html.haml	Render collection in services finder	2011-05-17 14:04:42 -07:00
_remote_friend.html.haml	move all aspects to be a method, and cleaned up some sockets helper uglyness ms iz	2011-06-16 11:17:14 -07:00
finder.html.haml	calls the job on login does a sync call if the cache friends was not called before, fixed the views	2011-03-21 14:56:50 -07:00
index.html.haml	nicer auth prompt. wip.	2011-06-23 12:40:47 -07:00
tumblr.html.haml	make the tumblr posting smarter	2011-06-02 17:02:29 -07:00