110swag / flashy-backend

Download as
Browse Code ยป

Commit 1c22f48d88f8f012f2408f7377a727a98c88cf2c

Authored by Rohan Rangray
2 parents 0b516c412b 60a2748ed6
Exists in master

Merge branch 'master' of git.ucsd.edu:110swag/flashy-backend 

Mergin' the conflicts

Showing 1 changed file Side-by-side Diff

flashy/settings.py View file @ 1c22f48
... ... @@ -96,6 +96,7 @@
96 96 USE_I18N = True
97 97 USE_L10N = True
98 98 USE_TZ = True
  99 +TIME_ZONE = 'America/Los_Angeles'
99 100  
100 101 QUARTER_START = UTC.localize(datetime(2015, 3, 30))
101 102 QUARTER_END = UTC.localize(datetime(2015, 6, 12))