Merge branch 'main' into releases/release-1.8.7

# Conflicts:
#	.swiftlint.yml
This commit is contained in:
Ben Chatelain 2024-07-29 17:20:05 -06:00
commit 7d063d6d0e
No known key found for this signature in database
2 changed files with 4 additions and 0 deletions

View file

@ -6,6 +6,7 @@
#
---
disabled_rules:
- non_optional_string_data_conversion
- trailing_comma
excluded:
- docs

View file

@ -0,0 +1,3 @@
{
"mas": "all"
}