merge: merge main into development_fix keeping development_fix versions

Browse Source

- Keep all development_fix build artifacts and configurations
- Resolve conflicts by preferring development_fix versions
- Maintain existing development_fix branch functionality

...

This commit is contained in:

sasha-astiadi

2025-08-18 23:47:27 +02:00

parent f3180f6642 66ef8ede14

commit 052ed1bcd6

145 changed files with 1535 additions and 169 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

.next/cache/images/+k+Uuw0u9Obf8qzN2AVIz-N3WyXG8ZyMz4gzBgkrqMs=/60.1755175503582.5Z2c4ZRRyRj9WYqRCKPfeZrB51VvHTh+0PUDShMFTA0=.webp vendored

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.9 KiB

BIN

.next/cache/images/BIaTM3DAo5EO3cCP4zcTQyaJRxE30z4ztGBa3p7OXts=/60.1755163761843.xp4xmePIKThEQ1ojQOw5axH-bees2C3rUiwmkyyL+0M=.webp vendored

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 18 KiB

BIN

.next/cache/images/HbpbBlNHXqyh1zv0Oug85LbyHXWIOniU2lYDdWQr+a0=/60.1755175316641.qC-Njlqr8X9v5vucUGWwAJ9RgZf8ZL2SiEGEZEzFKog=.webp vendored

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 17 KiB

BIN

.next/cache/images/KWSftZG0sASoiTc536XN30EjNYEyepqV6WANXe+6hCQ=/60.1755175503583.8OcPitfpqFydwyL6-HGgdkF0FIK5FP93AxRg3CPiiMo=.webp vendored

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.0 KiB

BIN

.next/cache/images/NxlUOAEIL2Rgl6E6uusTO2ROTSyDb0Uy-33L4jaAXsU=/60.1755175503641.gXBKmN4VQlnZu9lr4eJbCEa1L8S5AX83sJ6yOOpaaaI=.webp vendored

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.7 KiB

BIN

.next/cache/images/VrQEXnLQZ5jRzzv1ix9KjPIRMu+twNjMCFs11fYmin8=/60.1755163761843.qC-Njlqr8X9v5vucUGWwAJ9RgZf8ZL2SiEGEZEzFKog=.webp vendored

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 17 KiB

BIN

.next/cache/images/bXItdVJTJZ7UgPICeIziJYhI7uo1sCTQ9NREBVkrBFk=/60.1755175503583.sKETIrm+9IJCfRswspKGUckIy8Ts8RIRHKT3QegwjGQ=.webp vendored

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.8 KiB

BIN

.next/cache/images/inm2yxezWVJcY6RWrPRTLkr6JBagwy2JzgX+6DxK0rc=/60.1755163761840.ZsQ5Kz1z9OiPUB8Q1AbEksec2GPVJM8bISnK4rSQbtw=.webp vendored

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 16 KiB

BIN

.next/cache/images/lBU4VwLKnJsg6768TlMQIFHcbZVj1VBgrC4YWmOaGuM=/60.1755175503641.uOPtETb7WtPmjxUd-Ex5Z7eqrSr2XhBpE6i9ngBmv3U=.webp vendored

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.0 KiB

BIN

.next/cache/images/sKH6E35xBcEDE9JeUT0TYKqzHX8RmYuRzHbpIDmyhCc=/60.1755175316657.GTqJMRHoa6-ILQ1MjU1Cd0YeQa92xv1q0MkgwfMYeOc=.webp vendored

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 14 KiB

BIN

.next/cache/images/t2Lt1aCobtMYfKw-FvvYJUgElaKpesKaS6D70hW5ozE=/60.1755163761843.GTqJMRHoa6-ILQ1MjU1Cd0YeQa92xv1q0MkgwfMYeOc=.webp vendored

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 14 KiB

BIN

.next/cache/images/tjllNMLsoobWESIaSsaJUsY3zhydkhuK8usq4CkUH+k=/60.1755175316636.ZsQ5Kz1z9OiPUB8Q1AbEksec2GPVJM8bISnK4rSQbtw=.webp vendored

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 16 KiB

BIN

.next/cache/images/v-23xu7tWhV+7PGYwFN0YLbbfIGCDoA6E6LwZYXUJXY=/60.1755175316656.xp4xmePIKThEQ1ojQOw5axH-bees2C3rUiwmkyyL+0M=.webp vendored

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 18 KiB