Merge remote-tracking branch 'origin/2.7.x' into 3.2.x

# Conflicts: # .github/workflows/publish-snapshot.yml # gradle.properties
lets-mica · Jul 24, 2024 · 0d9c00d · 0d9c00d
2 parents 6ea888a + 1c61968
commit 0d9c00d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@
 bin/
 
 ### IntelliJ IDEA ###
+!.idea/icon.png
 .idea
 out/
 *.iws

diff --git a/.idea/icon.png b/.idea/icon.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,7 @@ @@
     bin/
     ### IntelliJ IDEA ###
+    !.idea/icon.png
     .idea
     out/
     *.iws
@@ Expand Down @@