From 11978397653addd1457867acbab958df436fc12a Mon Sep 17 00:00:00 2001
From: Harry Moreno <morenoh149@gmail.com>
Date: Tue, 26 Jun 2018 18:32:15 -0400
Subject: [PATCH 1/2] Update docs to support django 2.0

---
 docs/setup.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setup.rst b/docs/setup.rst
index db2a34e..1335bc5 100644
--- a/docs/setup.rst
+++ b/docs/setup.rst
@@ -17,7 +17,7 @@ modify your ``INSTALLED_APPS`` setting.
 Dependencies
 ============
 
-``django-model-utils`` supports `Django`_ 1.8 through 1.10 (latest bugfix
+``django-model-utils`` supports `Django`_ 1.8 through 2.0 (latest bugfix
 release in each series only) on Python 2.7, 3.3 (Django 1.8 only), 3.4 and 3.5.
 
 .. _Django: http://www.djangoproject.com/

From e750fc7408b9b9dc542b41d820cbf5417389eb43 Mon Sep 17 00:00:00 2001
From: Martey Dodoo <martey@mobolic.com>
Date: Thu, 26 Apr 2018 16:42:43 -0400
Subject: [PATCH 2/2] Fix AUTHORS.rst formatting.

Add pipe character at the beginning of each line so that all authors are
not concatenated together when ReStructuredText is parsed. Add Martey to
AUTHORS as well.
---
 AUTHORS.rst | 91 +++++++++++++++++++++++++++--------------------------
 1 file changed, 46 insertions(+), 45 deletions(-)

diff --git a/AUTHORS.rst b/AUTHORS.rst
index fd350c0..99c50b4 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -1,45 +1,46 @@
-ad-m <github.com/ad-m>
-Alejandro Varas <alej0varas@gmail.com>
-Alex Orange <crazycasta@gmail.com>
-Alexey Evseev <myhappydo@gmail.com>
-Andy Freeland <andy@andyfreeland.net>
-Artis Avotins <artis.avotins@gmail.com>
-Bram Boogaard <b.boogaard@auto-interactive.nl>
-Carl Meyer <carl@dirtcircle.com>
-Curtis Maloney <curtis@tinbrain.net>
-Den Lesnov
-Dmytro Kyrychuk <dmytro.kyrychuck@gmail.com>
-Donald Stufft <donald.stufft@gmail.com>
-Douglas Meehan <dmeehan@gmail.com>
-Facundo Gaich <facugaich@gmail.com>
-Felipe Prenholato <philipe.rp@gmail.com>
-Filipe Ximenes <filipeximenes@gmail.com>
-Gregor Müllegger <gregor@muellegger.de>
-Hanley Hansen <hanleyhansen@gmail.com>
-ivirabyan
-James Oakley <jfunk@funktronics.ca>
-Jannis Leidel <jannis@leidel.info>
-Jarek Glowacki <github.com/jarekwg>
-Javier García Sogo <jgsogo@gmail.com>
-Jeff Elmore <jeffelmore.org>
-Keryn Knight <kerynknight.com>
-Matthew Schinckel <matt@schinckel.net>
-Michael van Tellingen <michaelvantellingen@gmail.com>
-Mike Bryant <mike@mikebryant.me.uk>
-Mikhail Silonov <silonov.pro>
-Patryk Zawadzki <patrys@room-303.com>
-Paul McLanahan <paul@mclanahan.net>
-Philipp Steinhardt <steinhardt@myvision.de>
-Rinat Shigapov <rinatshigapov@gmail.com>
-Rodney Folz <rodney@rodneyfolz.com>
-Romain Garrigues <github.com/romgar>
-rsenkbeil <github.com/rsenkbeil>
-Ryan Kaskel <dev@ryankaskel.com>
-Simon Meers <simon@simonmeers.com>
-sayane
-Tony Aldridge <zaragopha@hotmail.com>
-Travis Swicegood <travis@domain51.com>
-Trey Hunner <trey@treyhunner.com>
-Karl Wan Nan Wo <karl.wnw@gmail.com>
-zyegfryed
-Radosław Jan Ganczarek <radoslaw@ganczarek.in>
+| ad-m <github.com/ad-m>
+| Alejandro Varas <alej0varas@gmail.com>
+| Alex Orange <crazycasta@gmail.com>
+| Alexey Evseev <myhappydo@gmail.com>
+| Andy Freeland <andy@andyfreeland.net>
+| Artis Avotins <artis.avotins@gmail.com>
+| Bram Boogaard <b.boogaard@auto-interactive.nl>
+| Carl Meyer <carl@dirtcircle.com>
+| Curtis Maloney <curtis@tinbrain.net>
+| Den Lesnov
+| Dmytro Kyrychuk <dmytro.kyrychuck@gmail.com>
+| Donald Stufft <donald.stufft@gmail.com>
+| Douglas Meehan <dmeehan@gmail.com>
+| Facundo Gaich <facugaich@gmail.com>
+| Felipe Prenholato <philipe.rp@gmail.com>
+| Filipe Ximenes <filipeximenes@gmail.com>
+| Gregor Müllegger <gregor@muellegger.de>
+| Hanley Hansen <hanleyhansen@gmail.com>
+| ivirabyan
+| James Oakley <jfunk@funktronics.ca>
+| Jannis Leidel <jannis@leidel.info>
+| Jarek Glowacki <github.com/jarekwg>
+| Javier García Sogo <jgsogo@gmail.com>
+| Jeff Elmore <jeffelmore.org>
+| Keryn Knight <kerynknight.com>
+| Martey Dodoo <martey+django-model-utils@mobolic.com>
+| Matthew Schinckel <matt@schinckel.net>
+| Michael van Tellingen <michaelvantellingen@gmail.com>
+| Mike Bryant <mike@mikebryant.me.uk>
+| Mikhail Silonov <silonov.pro>
+| Patryk Zawadzki <patrys@room-303.com>
+| Paul McLanahan <paul@mclanahan.net>
+| Philipp Steinhardt <steinhardt@myvision.de>
+| Rinat Shigapov <rinatshigapov@gmail.com>
+| Rodney Folz <rodney@rodneyfolz.com>
+| Romain Garrigues <github.com/romgar>
+| rsenkbeil <github.com/rsenkbeil>
+| Ryan Kaskel <dev@ryankaskel.com>
+| Simon Meers <simon@simonmeers.com>
+| sayane
+| Tony Aldridge <zaragopha@hotmail.com>
+| Travis Swicegood <travis@domain51.com>
+| Trey Hunner <trey@treyhunner.com>
+| Karl Wan Nan Wo <karl.wnw@gmail.com>
+| zyegfryed
+| Radosław Jan Ganczarek <radoslaw@ganczarek.in>