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

ao-apps · Feb 7, 2025 · a531ec6 · a531ec6
2 parents 6806ab0 + 54cff85
commit a531ec6
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,4 +12,6 @@ buildNumber.properties
 .mvn/timing.properties
 .LCKpom.xml~
 .directory
+desktop.ini
+Thumbs.db
 .DS_Store