diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-08-03 16:05:35 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-08-03 16:05:35 -0300 |
commit | fbd23db51b7160a308cd88e407e676994eb08b10 (patch) | |
tree | e3816cc4e3f0ee07539fb4464b2d886a43ecc318 /settings.py | |
parent | a8b2fc84ba96c83ec1addf89ac04608fbf572705 (diff) | |
parent | 0f6c80e9a36bc5770e95543b4374c5ace4383cf5 (diff) |
Merge branch 'master' of git://projects.archlinux.org/archweb
Conflicts:
packages/urls.py
templates/packages/details.html
Diffstat (limited to 'settings.py')
-rw-r--r-- | settings.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/settings.py b/settings.py index b1063dfe..0bc1d084 100644 --- a/settings.py +++ b/settings.py @@ -32,6 +32,7 @@ SITE_ID = 1 # Default date format in templates for 'date' filter DATE_FORMAT = 'Y-m-d' +DATETIME_FORMAT = 'Y-m-d H:i' # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a # trailing slash. |