Skip to content

Commit

Permalink
Merge branch 'develop' into sam/netp-quick-action
Browse files Browse the repository at this point in the history
* develop:
  bump BSK (changed dashboard API) (#2111)
  Integrate BSK changes (#2101)
  bump bsk for duckplayer fixes on BigSur (#2106)
  iOS VPN Settings part 1 (#2109)
  Release 7.94.0 (#2107)
  Append build number to metricKit crash version (#2100)
  Disable NetP errors temporarily (#2102)
  NetP: Fix server location formatting (#2099)
  Release 7.93.0 (#2096)
  • Loading branch information
samsymons committed Oct 23, 2023
2 parents 9d98e82 + 97551e4 commit bb55e83
Show file tree
Hide file tree
Showing 23 changed files with 1,128 additions and 827 deletions.
2 changes: 1 addition & 1 deletion Configuration/Version.xcconfig
Original file line number Diff line number Diff line change
@@ -1 +1 @@
MARKETING_VERSION = 7.93.0
MARKETING_VERSION = 7.94.0
4 changes: 2 additions & 2 deletions Core/AppPrivacyConfigurationDataProvider.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import BrowserServicesKit
final public class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider {

public struct Constants {
public static let embeddedDataETag = "\"81da520221d37e6398ea3d8940595810\""
public static let embeddedDataSHA = "19766ed7e598cdc123c9db702264b99d0cff5ddfb2ed226fba85b06d304f7e0b"
public static let embeddedDataETag = "\"34b6806ec63c85144adb71af7e899b40\""
public static let embeddedDataSHA = "167fdf9054fd7a0f8b2e9b5f84a8dae7d569752b0278d82b6a394380531f61e5"
}

public var embeddedDataEtag: String {
Expand Down
4 changes: 2 additions & 2 deletions Core/AppTrackerDataSetProvider.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import BrowserServicesKit
final public class AppTrackerDataSetProvider: EmbeddedDataProvider {

public struct Constants {
public static let embeddedDataETag = "\"a1bb76901a395eb251cd6f30f54037f1\""
public static let embeddedDataSHA = "53cad742076d1382fba8db0e508307668eb0609738d526cb16cbc623b50410fc"
public static let embeddedDataETag = "\"3b73923ebfd4702c33aea682db0bac11\""
public static let embeddedDataSHA = "16e1e52530db19badfefc9a07d76620f9c608c12dc144f67020da8a9a4ddb0fa"
}

public var embeddedDataEtag: String {
Expand Down
Loading

0 comments on commit bb55e83

Please sign in to comment.