Browse Source

Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0

Laurent Destailleur 4 years ago
parent
commit
755de9fff2
1 changed files with 1 additions and 0 deletions
  1. 1 0
      .gitignore

+ 1 - 0
.gitignore

@@ -16,6 +16,7 @@ default.properties
 .DS_Store
 .idea
 *.iml
+*.orig
 Thumbs.db
 /dolibarr_genesis.mp4
 # Log files