From 32d71a3897a27a31505866be6730ac8c84fc0d61 Mon Sep 17 00:00:00 2001
From: Doug Blank <doug.blank@gmail.com>
Date: Fri, 8 Nov 2013 14:02:14 +0000
Subject: [PATCH] Changes for Django 1.5.4

svn: r23474
---
 gramps/webapp/settings.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gramps/webapp/settings.py b/gramps/webapp/settings.py
index 1bc052b6e..39e665395 100644
--- a/gramps/webapp/settings.py
+++ b/gramps/webapp/settings.py
@@ -158,3 +158,8 @@ CACHES = {
     }
 DEFAULT_CHARSET = "utf-8"
 ## End Changes for Django 1.5
+
+## Changes for Django 1.5.4:
+LOGGING_CONFIG = None
+AUTH_USER_MODEL = 'auth.User'
+## End Changes for Django 1.5.4