-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into graeme/sanitize-location-selection
# By Elle Sullivan (10) and others # Via GitHub (6) and others * main: (42 commits) Update autoconsent to v10.9.0 (#2822) Bump version to 1.90.0 (196) Revert "Add PIPAgent entitlement (#2821)" (#2823) Bump version to 1.90.0 (195) Bump version to 1.90.0 (194) Add PIPAgent entitlement (#2821) Fixes some VPN uninstallation issues (#2820) Bump version to 1.90.0 (193) Remove autofill survey (#2819) Remove autofill survey (#2819) Bump version to 1.90.0 (192) Set marketing version to 1.90.0 Update embedded files Privacy Pro survey support (#2816) Update PeopleWhiz Broker Files to use hash id (#2814) Update BSK due to iOS changes. (#2776) Scroll address bar to caret when using arrows (#2799) Privacy Pro macOS quick follow ups (#2813) BSK bump for iOS RMF updates (#2798) Autofill engagement KPIs for pixel reporting (#2806) ... # Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
- Loading branch information
Showing
192 changed files
with
6,367 additions
and
4,740 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
CURRENT_PROJECT_VERSION = 190 | ||
CURRENT_PROJECT_VERSION = 196 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
MARKETING_VERSION = 1.89.0 | ||
MARKETING_VERSION = 1.90.0 |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
DuckDuckGo.xcodeproj/xcshareddata/xcschemes/sandbox-test-tool.xcscheme
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.