Merge lp:~lukasz-czyzykowski/twitbuntu/settings-cleanup into lp:twitbuntu

Proposed by Łukasz Czyżykowski
Status: Merged
Approved by: Łukasz Czyżykowski
Approved revision: 26
Merged at revision: 26
Proposed branch: lp:~lukasz-czyzykowski/twitbuntu/settings-cleanup
Merge into: lp:twitbuntu
Diff against target: 27 lines (+6/-7)
1 file modified
settings.py (+6/-7)
To merge this branch: bzr merge lp:~lukasz-czyzykowski/twitbuntu/settings-cleanup
Reviewer Review Type Date Requested Status
Łukasz Czyżykowski Approve
Review via email: mp+34975@code.launchpad.net

Commit message

Cleaning up settings.py

To post a comment you must log in.
Revision history for this message
Łukasz Czyżykowski (lukasz-czyzykowski) wrote :

OK.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'settings.py'
--- settings.py 2010-09-08 19:05:39 +0000
+++ settings.py 2010-09-09 14:01:01 +0000
@@ -4,17 +4,16 @@
4TEMPLATE_DEBUG = DEBUG4TEMPLATE_DEBUG = DEBUG
55
6ADMINS = (6ADMINS = (
7 # ('Your Name', 'your_email@domain.com'),
8)7)
98
10MANAGERS = ADMINS9MANAGERS = ADMINS
1110
12DATABASE_ENGINE = 'sqlite3' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.11DATABASE_ENGINE = 'sqlite3'
13DATABASE_NAME = 'db.sqlite' # Or path to database file if using sqlite3.12DATABASE_NAME = 'db.sqlite'
14DATABASE_USER = '' # Not used with sqlite3.13DATABASE_USER = ''
15DATABASE_PASSWORD = '' # Not used with sqlite3.14DATABASE_PASSWORD = ''
16DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3.15DATABASE_HOST = ''
17DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3.16DATABASE_PORT = ''
1817
19# Local time zone for this installation. Choices can be found here:18# Local time zone for this installation. Choices can be found here:
20# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name19# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name

Subscribers

People subscribed via source and target branches

to all changes: