Pull requests

#24 Open
Repository
stephenpaulger stephenpaulger
Branch
default
Repository
jespern jespern
Branch
default

Alterations to fixtures.

Bitbucket cannot automatically merge this request due to conflicts.

Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:

hg update 
hg pull -r default https://bitbucket.org/stephenpaulger/django-piston
Author
  1. Stephen Paulger
Reviewers
Description

Allow fixtures to be installed to allow Django tests to pass.

Move the models.json to piston__models.json to reduce the risk of conflicting with other apps with similarly named fixtures.

Comments (0)