Reverting accidental push to main #2718
Merged
Conversation
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 reverts commit 174f46f.
samsymons
added a commit
that referenced
this pull request
Apr 12, 2024
# By Mariusz Śpiewak (4) and others # Via Chris Brind (1) and others * main: Reverting accidental push to main (#2718) Add SubscriptionContainerViewModel and Manually hide loader + Pixel (#2687) Release 7.115.0-2 (#2712) soft revert history suggestions (#2711) Bring back accessibility identifiers for onboarding buttons (#2709) BSK release 133.1.0 (#2708) Password Manager widget and app shortcut (#2619) Release 7.115.0-1 (#2707) Update set-as-default onboarding illustration for dark mode (#2694) update app store prompt logic (#2678) Fix status bar color on regular width size class (#2705) Updated settings (#2603) Update BSK with autofill 11.0.1 (#2704) # Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj # DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
samsymons
added a commit
that referenced
this pull request
Apr 15, 2024
# By Daniel Bernal (33) and others # Via Mariusz Śpiewak (5) and others * main: (245 commits) Fix inconsistent bars state when scrolling (#2733) fix tests (#2732) Release 7.115.0-4 (#2729) Fix VPN denial prompt loop (#2728) Small UI Fixes for subscriptions (#2690) SPM updated: SwiftSoup, Lottie, ZIPFoundation (#2724) Release 7.115.0-3 (#2727) VPN: Specific TunnelController start failure reporting (#2714) update bsk dependency (#2725) Subscriptions: Fix thread issue on Subscription Restore (#2719) Manage ‘Stale’ PRs (#2723) maestro: hide dax dialogs if visible and cancel keyboard after fireproof (#2695) Remove timezone offset from the VPN server object (#2701) Reverting accidental push to main (#2718) Add SubscriptionContainerViewModel and Manually hide loader + Pixel (#2687) Release 7.115.0-2 (#2712) soft revert history suggestions (#2711) Bring back accessibility identifiers for onboarding buttons (#2709) BSK release 133.1.0 (#2708) ... # Conflicts: # Core/Pixel.swift
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This (cleanly) reverts commit 174f46f pushed by accident