Skip to content

Commit

Permalink
Merge branch 'main' into sam/vpn-snooze-initial-support
Browse files Browse the repository at this point in the history
# By Diego Rey Mendez (2) and others
# Via Diego Rey Mendez (1) and GitHub (1)
* main:
  Add connection tester failure pixels (#881)
  De-duplicate passwords on import (#869)
  Privacy Dashboard refactor (#879)
  Improve VPN logging logic (#877)
  Subscription refactoring #5 (#874)
  Fixes for Xcode16 (#864)
  Update the Privacy Pro status attribute to use an array. (#878)

# Conflicts:
#	Sources/NetworkProtection/PacketTunnelProvider.swift
  • Loading branch information
samsymons committed Jul 7, 2024
2 parents 5dad425 + 0746af0 commit 068cf64
Show file tree
Hide file tree
Showing 92 changed files with 2,854 additions and 793 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
<true/>
</dict>
</plist>
Loading

0 comments on commit 068cf64

Please sign in to comment.