Skip to content

Commit 1578495

Browse files
committed
Merge branch 'trunk' into merge/release-22.6-into-trunk
2 parents 669c9f6 + 9ae6596 commit 1578495

File tree

2,567 files changed

+10552
-22262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,567 files changed

+10552
-22262
lines changed

.swiftlint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ excluded:
55
- DerivedData
66
- fastlane
77
- Modules/.build
8+
- Modules/DerivedData
89
- Pods
910
- Scripts
1011
# Automattic's CI caching setup may generate this in the project folder

Fakes/Fakes.xcodeproj/project.pbxproj

Lines changed: 0 additions & 428 deletions
This file was deleted.

Fakes/Fakes.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 0 additions & 7 deletions
This file was deleted.

Fakes/Fakes.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

Lines changed: 0 additions & 8 deletions
This file was deleted.

Fakes/Fakes/Fakes.h

Lines changed: 0 additions & 18 deletions
This file was deleted.

Fakes/Fakes/Fakes.xcconfig

Lines changed: 0 additions & 1 deletion
This file was deleted.

Fakes/Fakes/Info.plist

Lines changed: 0 additions & 22 deletions
This file was deleted.

Hardware/Hardware.xcodeproj/project.pbxproj

Lines changed: 0 additions & 1111 deletions
This file was deleted.

Hardware/Hardware/Hardware.h

Lines changed: 0 additions & 11 deletions
This file was deleted.

Hardware/Hardware/Hardware.xcconfig

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)