Closed davidcollom closed 12 years ago
Play.com Model integration
This pull request fails (merged 318ec5bc into a9153f34).
This pull request passes (merged 2b590b94 into a9153f34).
Got merge confilct in spec/factories/models.rb after merging googleshopping and game.co.uk branches. No worries, fixed by hand.
spec/factories/models.rb
googleshopping
game.co.uk
Play.com Model integration