Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into 6.x
Browse files Browse the repository at this point in the history
  • Loading branch information
jmini committed Nov 21, 2024
2 parents eb66036 + 0a1b6e0 commit f1a7e2d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*.pydevproject
.project
.metadata
/bin
bin/
tmp/
*.tmp
*.bak
Expand Down

0 comments on commit f1a7e2d

Please sign in to comment.