danielgrippi 7eaca0346c Merge branch 'master' into follow ... Conflicts: config/assets.yml public/stylesheets/sass/_mixins.scss spec/models/user/posting_spec.rb		2011-05-16 14:56:28 -07:00
..
fake_http_request.rb
fake_redis.rb
fake_resque.rb
fake_typhoeus.rb
fixture_builder.rb
fixture_generation.rb	Update rspec	2011-05-13 17:52:37 -07:00
i18n_raise_errors.rb
no_id_on_object.rb
user_methods.rb	Merge branch 'master' into follow	2011-05-04 11:35:35 -07:00