aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2013-03-15 19:32:30 +0000
committerTom Christie2013-03-15 19:32:30 +0000
commit5f5b22d86f6d59c72adbd7f39a6ab998675aabef (patch)
treec27de3d7a5f3247839798ce20b893451952fc9cd
parent47492e3ef4e24ecd155091247e479851789ee8e9 (diff)
parent1aedf57f4a1eb7261162977944fe233b00d63b59 (diff)
downloaddjango-rest-framework-5f5b22d86f6d59c72adbd7f39a6ab998675aabef.tar.bz2
Merge branch 'basic-nested-serialization' into one-to-one-nested-wip
0 files changed, 0 insertions, 0 deletions