Changeset 165e5aa

Timestamp:

Jan 19, 2012, 5:55:59 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

test-hooks

Parents:

60b13ff (diff), ab35ead (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@…> (01/19/12 05:55:59)

git-committer:

Alex Dehnert <adehnert@…> (01/19/12 05:55:59)

Message:

Merge branch 'test-hooks' of ​https://asa-db.scripts.mit.edu/git/asa-db/asa-db into test-hooks

Files:

• asadb/settings.py (modified) (2 diffs)
• bar (modified) (1 diff)

asadb/settings.py

@@ -1 +1 @@
 # Django settings for asadb project.
-aoeuaoeu
-oaoeuaoeuaoeu
-
-aoeuaeoiaeoi
-
-a
-
-aeiaoei
-
 
 import os
@@ -137 +128 @@
 
 from local_settings_after import *
-aeouaoeui
-;qjk;qjk
-
-;qiaeiaepui
-lgnsmtnglrcghwzmtnh
-hsntghcrgwm

bar

@@ -1 @@
-baz
+quux