summaryrefslogtreecommitdiff
path: root/django/db
diff options
context:
space:
mode:
Diffstat (limited to 'django/db')
-rw-r--r--django/db/models/options.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/db/models/options.py b/django/db/models/options.py
index 0786e525b3..666885aeed 100644
--- a/django/db/models/options.py
+++ b/django/db/models/options.py
@@ -35,6 +35,8 @@ DEFAULT_NAMES = (
'select_on_save', 'default_related_name', 'required_db_features',
'required_db_vendor', 'base_manager_name', 'default_manager_name',
'indexes',
+ # For backwards compatibility with Django 1.11. RemovedInDjango30Warning
+ 'manager_inheritance_from_future',
)