Merge 71823a71a3 into 84c6914a9b

Global/macOS.gitignore

@@ -1,25 +1,25 @@
-# General
+# General
-.DS_Store
+.DS_Store
-__MACOSX/
+__MACOSX/
-.AppleDouble
+.AppleDouble
-.LSOverride
+.LSOverride
-Icon[␍]
+Icon[\r]
-
+
-# Thumbnails
+# Thumbnails
-._*
+._*
-
+
-# Files that might appear in the root of a volume
+# Files that might appear in the root of a volume
-.DocumentRevisions-V100
+.DocumentRevisions-V100
-.fseventsd
+.fseventsd
-.Spotlight-V100
+.Spotlight-V100
-.TemporaryItems
+.TemporaryItems
-.Trashes
+.Trashes
-.VolumeIcon.icns
+.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
+.com.apple.timemachine.donotpresent
-
+
-# Directories potentially created on remote AFP share
+# Directories potentially created on remote AFP share
-.AppleDB
+.AppleDB
-.AppleDesktop
+.AppleDesktop
-Network Trash Folder
+Network Trash Folder
-Temporary Items
+Temporary Items
-.apdisk
+.apdisk