Permalink
Browse files

Merge branch 'master' of https://github.com/sirex/django-mockups

Conflicts:
	mockups/factory.py
  • Loading branch information...
2 parents 10f988a + d044fbd commit 7fe1f0f966e0cc182204f3ac9209ef34466d2a54 @sirex sirex committed May 10, 2011
Showing with 0 additions and 0 deletions.

0 comments on commit 7fe1f0f

Please sign in to comment.