Skip to content

Commit ffb2b46

sliverc sliverc

authored

Merge branch 'master' into get-related-instance

2 parents d41014b + f3e67a7 commit ffb2b46Copy full SHA for ffb2b46

File tree

2 files changed

+2

-7

lines changed

example
- fixtures
  - blogentry.json
- settings
  - dev.py

2 files changed

+2

-7

lines changed

`‎example/fixtures/blogentry.json‎`

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -83,9 +83,7 @@`
`83`	`83`	`"n_comments": 0,`
`84`	`84`	`"n_pingbacks": 0,`
`85`	`85`	`"rating": 0,`
`86`		`- "authors": [`
`87`		`- 1`
`88`		`- ]`
	`86`	`+ "authors": []`
`89`	`87`	`}`
`90`	`88`	`},`
`91`	`89`	`{`
`@@ -102,9 +100,7 @@`
`102`	`100`	`"n_comments": 0,`
`103`	`101`	`"n_pingbacks": 0,`
`104`	`102`	`"rating": 0,`
`105`		`- "authors": [`
`106`		`- 2`
`107`		`- ]`
	`103`	`+ "authors": []`
`108`	`104`	`}`
`109`	`105`	`},`
`110`	`106`	`{`

`‎example/settings/dev.py‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@`
`21`	`21`	`'django.contrib.sites',`
`22`	`22`	`'django.contrib.sessions',`
`23`	`23`	`'django.contrib.auth',`
`24`		`- 'django.contrib.admin',`
`25`	`24`	`'rest_framework',`
`26`	`25`	`'polymorphic',`
`27`	`26`	`'example',`

0 commit comments

Comments

(0)