diff options
| author | Tom Christie | 2013-12-16 13:51:57 +0000 |
|---|---|---|
| committer | Tom Christie | 2013-12-16 13:51:57 +0000 |
| commit | 889401989948db9e9825478e71aa1611b4390d17 (patch) | |
| tree | 0a27dfaea48bf914458dd405ee182674e4ca4769 /docs/tutorial/1-serialization.md | |
| parent | 0f37260254af03e16ef8144e34313876970b2937 (diff) | |
| parent | 735c75abb9e612fa0f1e6bdfa4283610752056d2 (diff) | |
| download | django-rest-framework-889401989948db9e9825478e71aa1611b4390d17.tar.bz2 | |
Merge branch 'nullbooleanfield_testcase' of git://github.com/dpetzel/django-rest-framework into dpetzel-nullbooleanfield_testcase
Conflicts:
rest_framework/tests/test_serializer.py
Diffstat (limited to 'docs/tutorial/1-serialization.md')
0 files changed, 0 insertions, 0 deletions