diff options
| author | prathamesh | 2014-11-28 14:17:00 +0530 |
|---|---|---|
| committer | prathamesh | 2014-11-28 14:17:00 +0530 |
| commit | ec7d9c71d352b9e0760250debc7274b439bc32ba (patch) | |
| tree | d5402453ce5ea7c280203cf2eee3d3f887221425 | |
| parent | a1e409925163204f83988c7aeeb668bc10f5a8dd (diff) | |
| parent | 4d1880d9a5bfe0b56d2f067479d48703a1a3e476 (diff) | |
| download | Python-TBC-Interface-ec7d9c71d352b9e0760250debc7274b439bc32ba.tar.gz Python-TBC-Interface-ec7d9c71d352b9e0760250debc7274b439bc32ba.tar.bz2 Python-TBC-Interface-ec7d9c71d352b9e0760250debc7274b439bc32ba.zip | |
Merge branch 'master' into certificate_generation
Conflicts:
tbc/views.py
| -rw-r--r-- | PythonTBC/settings.py | 1 | ||||
| -rwxr-xr-x | tbc/views.py | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/PythonTBC/settings.py b/PythonTBC/settings.py index e2cafba..f7cab4e 100644 --- a/PythonTBC/settings.py +++ b/PythonTBC/settings.py @@ -135,6 +135,7 @@ INSTALLED_APPS = ( # 'django.contrib.admindocs', 'tbc', 'comments', + 'south', ) SESSION_SERIALIZER = 'django.contrib.sessions.serializers.JSONSerializer' diff --git a/tbc/views.py b/tbc/views.py index 00164d0..eaef347 100755 --- a/tbc/views.py +++ b/tbc/views.py @@ -1229,4 +1229,3 @@ def ajax_matching_books(request): 'matches': matches, 'flag': flag } - return render_to_response('tbc/ajax-matching-books.html', context) |