Merge 70cc8bae7c into c677dd99d4

Merge pull request #4834 from wispgitgecko9/patch-2
Update macOS.gitignore
2026-08-30 11:47:22 +02:00 · 2026-04-08 12:34:26 +00:00 · 2026-04-07 20:04:22 -07:00 · 2026-04-07 20:02:07 -07:00 · 2026-04-03 21:59:36 -05:00 · 2026-02-19 00:04:20 +01:00
2 changed files with 2 additions and 0 deletions
--- a/Global/JetBrains.gitignore
+++ b/Global/JetBrains.gitignore
@ -22,6 +22,7 @@
 .idea/**/dynamic.xml
 .idea/**/uiDesigner.xml
 .idea/**/dbnavigator.xml
 .idea/**/sshConfigs.xml
 # Gradle
 .idea/**/gradle.xml
--- a/Global/macOS.gitignore
+++ b/Global/macOS.gitignore
@ -1,5 +1,6 @@
 # General
 .DS_Store
 .localized
 __MACOSX/
 .AppleDouble
 .LSOverride
Author	SHA1	Message	Date
Jakob Wilke	491c64e1b5	Merge `70cc8bae7c` into `c677dd99d4`	2026-04-08 12:34:26 +00:00
Devin Dooley	c677dd99d4	Merge pull request #4834 from wispgitgecko9/patch-2 Update macOS.gitignore	2026-04-07 20:04:22 -07:00
Devin Dooley	a78658650d	Revert change to Icon rule	2026-04-07 20:02:07 -07:00
WiSP	6a7b122e75	Update macOS.gitignore Added .localized file to the gitignore.	2026-04-03 21:59:36 -05:00
Jakob Wilke	70cc8bae7c	feat: add sshConfigs.xml to JetBrains gitignore	2026-02-19 00:04:20 +01:00