Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Oliver Walters 2020-10-18 20:14:36 +11:00
commit 1ec6bc86d1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
InvenTree/InvenTree/settings.py
View File

@ -355,8 +355,7 @@ LOCALE_PATHS = (
os.path.join(BASE_DIR, 'locale/'), os.path.join(BASE_DIR, 'locale/'),
) )
TIME_ZONE = CONFIG.get('timezone', 'UTC')
TIME_ZONE = 'UTC'
USE_I18N = True USE_I18N = True

5
InvenTree/config_template.yaml
View File

@ -21,6 +21,11 @@ database:
# Select default system language (default is 'en-us') # Select default system language (default is 'en-us')
language: en-us language: en-us
# System time-zone (default is UTC)
# Reference: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
# Select an option from the "TZ database name" column
timezone: UTC
# Set debug to False to run in production mode # Set debug to False to run in production mode
debug: True debug: True