Gang Li 8e7c5af16c Merge remote-tracking branch 'remotes/upstream/master' ...

Conflicts:
	AUTHORS
	docs/changelog.rst

2015-10-18 01:28:50 -04:00

..

_themes/sphinx_rtd_theme

Various fixes again

2015-06-24 00:50:36 +02:00

code

Removed __len__ from queryset (#247)

2013-04-22 16:19:55 +00:00

guide

Merge pull request #1084 from optik/patch-1

2015-09-02 18:27:10 +02:00

apireference.rst

Document FieldDoesNotExist and meta.strict

2015-04-13 18:07:48 +02:00

changelog.rst

Merge remote-tracking branch 'remotes/upstream/master'

2015-10-18 01:28:50 -04:00

conf.py

Docs update and canonical url fix

2013-12-13 09:46:45 +00:00

django.rst

some more update, mainly docs

2015-06-23 23:16:08 +02:00

index.rst

Doc fixes, thanks @3Inc

2014-12-02 00:37:06 -02:00

Makefile

Added API Reference to docs

2009-12-19 16:04:05 +00:00

tutorial.rst

fix typo: "a the structure" -> "the structure"

2015-02-20 19:41:20 +03:00

upgrade.rst

Match other code blocks

2015-05-04 15:02:01 -07:00