Merge branch 'master' of https://github.com/opencart/opencart.github.io

opencart · Dec 9, 2023 · 91503af · 91503af
2 parents 0e08ba5 + 02b75f6
commit 91503af
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 .idea/modules.xml
 *.xml
 .idea/opencart.github.io.iml
+.idea/*
diff --git a/.idea/.gitignore b/.idea/.gitignore
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ @@
     .idea/modules.xml
     *.xml
     .idea/opencart.github.io.iml
+    .idea/*