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

1

.next/static/media/1.c1dd8c88.svg

File diff suppressed because one or more lines are too long

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

1

.next/static/media/2.61fe5d45.svg

File diff suppressed because one or more lines are too long

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

BIN

.next/static/media/26a46d62cd723877-s.woff2

Binary file not shown.

1

.next/static/media/3.27cdc0c2.svg

File diff suppressed because one or more lines are too long

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

1

.next/static/media/4.f84323cb.svg

File diff suppressed because one or more lines are too long

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

1

.next/static/media/5.b17316e3.svg

File diff suppressed because one or more lines are too long

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

BIN

.next/static/media/55c55f0601d81cf3-s.woff2

Binary file not shown.

BIN

.next/static/media/581909926a08bbc8-s.woff2

Binary file not shown.

1

.next/static/media/6.e4517726.svg

File diff suppressed because one or more lines are too long

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

BIN

.next/static/media/630e0b819503bca7-s.woff2

Binary file not shown.

BIN

.next/static/media/6a1a9d784472a388-s.woff2

Binary file not shown.

BIN

.next/static/media/84455f2b5a591033-s.p.woff2

Binary file not shown.

BIN

.next/static/media/8e9860b6e62d6359-s.woff2

Binary file not shown.

BIN

.next/static/media/97e0cb1ae144a2a9-s.woff2

Binary file not shown.

BIN

.next/static/media/act1.42297fa8.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.2 MiB

BIN

.next/static/media/act2.4b9f1132.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.4 MiB

BIN

.next/static/media/act3.c6e86186.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.4 MiB

BIN

.next/static/media/avatar-1.c78616b7.png

Binary file not shown.

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

BIN

.next/static/media/avatar-2.c72e5a40.png

Binary file not shown.

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

BIN

.next/static/media/avatar-3.eaa9ef6f.png

Binary file not shown.

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

BIN

.next/static/media/avatar-4.16b4e29e.png

Binary file not shown.

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

BIN

.next/static/media/avatar-5.e7f7faf2.png

Binary file not shown.

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

BIN

.next/static/media/background-auth.4bcf3f4b.jpg

Binary file not shown.

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

BIN

.next/static/media/background-call-to-action.c015e16f.jpg

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.2 MiB

BIN

.next/static/media/background-call-to-action2.d9f87ea8.png

Binary file not shown.

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

BIN

.next/static/media/background-call-to-action4.f1074346.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.3 MiB

BIN

.next/static/media/background-faqs.55d2e36a.jpg

Binary file not shown.

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

BIN

.next/static/media/df0a9ae256c0569c-s.woff2

Binary file not shown.

BIN

.next/static/media/e4af272ccee01ff0-s.p.woff2

Binary file not shown.

1

.next/static/media/logo_name.9eb5fb93.svg

File diff suppressed because one or more lines are too long

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

BIN

.next/static/media/newfeatures0.da45213f.png

Binary file not shown.

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

BIN

.next/static/media/newfeatures3.f677537c.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.6 MiB

BIN

.next/static/media/veda1.3bc26d7d.jpg

Binary file not shown.

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

BIN

.next/static/media/veda2.d6a4a301.jpg

Binary file not shown.

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

BIN

.next/static/media/veda3.deca791e.jpg

Binary file not shown.

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

BIN

.next/static/media/veda4.153182c1.jpg

Binary file not shown.

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