Skip to content

Commit 96c8eb3

Browse files
committed
Merge main into adfastltda/main: resolve conflicts by keeping latest changes from both branches
2 parents d741d0a + 614688b commit 96c8eb3

1 file changed

Lines changed: 17 additions & 0 deletions

File tree

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,23 @@
2020
- Enhanced state initialization and lifecycle management
2121
- Improved layout responsiveness and SafeArea integration
2222

23+
### Merged
24+
- Merged branch `development`: updated VPN link configuration to use 5.35.98.91
25+
- Merged branch `dodonov`: updated dependencies, improved l10n configuration, changed Android status bar style
26+
- Merged branch `feat/setting_page+adapter_telegrambot`: added settings page adapter, improved localization, updated plugin registrants, switched to JSON localization assets
27+
- Merged branch `bugfix/localization-no-synthetic-package`: resolved localization package issues, merged latest development changes
28+
- Merged branch `bugfix/vpnclient-engine-dependency`: improved VPN engine dependency handling, resolved localization and UI conflicts
29+
- Merged branch `refactoring-branch`: added new functionality including settings page, speed page, VPN provider, and navigation improvements
30+
- Merged branch `hotfix/temporary-vpn-uri`: updated VPN URI configuration to use temporary server
31+
- Merged branch `feat/vpn-link-selector`: added VPN link selector functionality
32+
- Merged branch `feat/dimensions`: added dimension links and UI improvements
33+
- Merged branch `feat/adding-ios-VPN-profile`: added iOS VPN profile support structure
34+
- Merged branch `ci/use-flutter-instead-dart-format`: updated CI configuration to use Flutter instead of dart format
35+
36+
### Conflict Resolution
37+
- Resolved multiple merge conflicts in pubspec.yaml, pubspec.lock, localization files, and generated plugin registrants
38+
- Kept latest HEAD versions for all major Dart and localization files to ensure stability and consistency
39+
2340
## [1.0.12] - 2025-01-XX
2441

2542
### Added

0 commit comments

Comments
 (0)