Merge remote-tracking branch 'origin/develop' into develop

# Conflicts: # taxi/views.py # taxi_service/settings.py
mate-academy · Nov 17, 2024 · e1edc43 · e1edc43
2 parents c8e7a76 + e8bd81f
commit e1edc43
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/taxi_service/settings.py b/taxi_service/settings.py
@@ -112,7 +112,7 @@
 
 LANGUAGE_CODE = "en-us"
 
-TIME_ZONE = "Europe/Kiev"
+TIME_ZONE = "UTC"
 
 USE_I18N = True
 
@@ -124,10 +124,6 @@
 
 STATIC_URL = "static/"
 
-STATICFILES_DIRS = [
-    BASE_DIR / "static",
-]
-
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field