Merge branch 'master' of github.com:Pearson-AI/pat-backend · kaylarose/quality-center@e60d86a · GitHub

Commit

Merge branch 'master' of github.com:Pearson-AI/pat-backend

Browse files

Conflicts:
	test/fixtures/vcr_cassettes/successful_login.yml
	test/test_rest.rb

Loading branch information

Carl Brasic committed Mar 26, 2012

2 parents 5296e13 + 9a2d643 commit e60d86a