diff options
| author | Raphaël Barrois <raphael.barrois@polytechnique.org> | 2014-01-21 21:15:02 +0100 |
|---|---|---|
| committer | Raphaël Barrois <raphael.barrois@polytechnique.org> | 2014-01-21 21:15:02 +0100 |
| commit | 402138768870871ef38b5c01ccaec957aa771d26 (patch) | |
| tree | ba4066c72a6ed72921d9707dd9bbd6ca8872a47a /tests/test_django.py | |
| parent | c404da5080c92527e26c6b82d5cc5d7d88ba3d9a (diff) | |
| parent | 3feb4f51a58e39a7aaf82222bff27ba181920b2e (diff) | |
| download | factory-boy-402138768870871ef38b5c01ccaec957aa771d26.tar factory-boy-402138768870871ef38b5c01ccaec957aa771d26.tar.gz | |
Merge branch 'maint/2.3.x'
Conflicts:
docs/changelog.rst
Diffstat (limited to 'tests/test_django.py')
0 files changed, 0 insertions, 0 deletions