Changeset 7444bbe for asadb/settings.py

Timestamp:

Aug 6, 2011, 5:43:39 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage, test-hooks

Children:

f27faaf

Parents:

89be44c (diff), bb674c2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Alex Dehnert <adehnert@…> (08/06/11 05:43:39)

git-committer:

Alex Dehnert <adehnert@…> (08/06/11 05:43:39)

Message:

Merge branch 'master' into new-db

Conflicts:

asadb/settings.py

File:

• asadb/settings.py (modified) (1 diff)

asadb/settings.py

@@ -72 +72 @@
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.middleware.transaction.TransactionMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
     'reversion.middleware.RevisionMiddleware',
 ]