Merge remote-tracking branch 'origin/1.x'

ao-apps · Jul 25, 2023 · 7f8b018 · 7f8b018
2 parents dda43f4 + 3a33bc2
commit 7f8b018
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ buildNumber.properties
 .mvn/timing.properties
 .LCKpom.xml~
 .directory
+.DS_Store