Merge remote-tracking branch 'origin/dev' into soft-inpainting

# Conflicts:
#	modules/processing.py

1 files changed, 1 insertions, 2 deletions

diff --git a/modules/config_states.py b/modules/config_states.py
index b766aef1..651793c7 100644
--- a/modules/config_states.py
+++ b/modules/config_states.py
@@ -4,7 +4,6 @@ Supports saving and restoring webui and extensions from a known working set of c
 
 import os
 import json
-import time
 import tqdm
 
 from datetime import datetime
@@ -38,7 +37,7 @@ def list_config_states():
     config_states = sorted(config_states, key=lambda cs: cs["created_at"], reverse=True)
 
     for cs in config_states:
-        timestamp = time.asctime(time.gmtime(cs["created_at"]))
+        timestamp = datetime.fromtimestamp(cs["created_at"]).strftime('%Y-%m-%d %H:%M:%S')
         name = cs.get("name", "Config")
         full_name = f"{name}: {timestamp}"
         all_config_states[full_name] = cs