Merge branch 'release' into dev_fedorov
# Conflicts: # Version.toml # app/auto/controller.py
This commit is contained in:
@@ -1,8 +1,16 @@
|
||||
[version]
|
||||
major = 1
|
||||
minor = 5
|
||||
<<<<<<< HEAD
|
||||
patch = 0
|
||||
|
||||
[build]
|
||||
date = "2026-09-27"
|
||||
time = "20:00:55"
|
||||
=======
|
||||
patch = 1
|
||||
|
||||
[build]
|
||||
date = "2026-09-27"
|
||||
time = "20:06:04"
|
||||
>>>>>>> release
|
||||
|
||||
Reference in New Issue
Block a user