Commit 6a632e04 authored by Andrew Godwin's avatar Andrew Godwin
Browse files

Merge branch 'master' into schema-alteration 

Conflicts:
	django/db/backends/__init__.py
	django/db/models/fields/related.py
	django/db/models/options.py
parents a589fdff fabe9c9e

.gitignore

+4 −0
Original line number Diff line number Diff line 
*.egg-info

*.pot

*.py[co]

MANIFEST

dist/

docs/_build/

tests/coverage_html/

tests/.coverage
 
 No newline at end of file

.hgignore

+2 −0
Original line number Diff line number Diff line
@@ -4,3 +4,5 @@ syntax:glob 
*.pot

*.py[co]

docs/_build/

tests/coverage_html/

tests/.coverage
 
 No newline at end of file

.tx/config

+1 −1
Original line number Diff line number Diff line 
[main]

host = https://www.transifex.net

host = https://www.transifex.com

lang_map = sr@latin:sr_Latn



[django.core]

AUTHORS

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ The PRIMARY AUTHORS are (and/or have been): 
    * Florian Apolloner

    * Jeremy Dunck

    * Bryan Veloso

    * Preston Holmes



More information on the main contributors to Django can be found in

docs/internals/committers.txt.
@@ -424,6 +425,7 @@ answer newbie questions, and generally made Django that much better: 
    phil@produxion.net

    phil.h.smith@gmail.com

    Gustavo Picon

    Travis Pinney

    Michael Placentra II <someone@michaelplacentra2.net>

    plisk

    Daniel Poelzleithner <http://poelzi.org/>
@@ -499,6 +501,7 @@ answer newbie questions, and generally made Django that much better: 
    Wiliam Alves de Souza <wiliamsouza83@gmail.com>

    Don Spaulding <donspauldingii@gmail.com>

    Calvin Spealman <ironfroggy@gmail.com>

    Dane Springmeyer

    Bjørn Stabell <bjorn@exoweb.net>

    Georgi Stanojevski <glisha@gmail.com>

    starrynight <cmorgh@gmail.com>

CONTRIBUTING.rst

0 → 100644
+16 −0
Original line number Diff line number Diff line 
======================

Contributing to Django

======================



As an open source project, Django welcomes contributions of many forms.



Examples of contributions include:



* Code patches

* Documentation improvements

* Bug reports and patch reviews



Extensive contribution guidelines are available in the repository at

``docs/internals/contributing/``, or online at:



https://docs.djangoproject.com/en/dev/internals/contributing/