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

This commit is contained in:
Laurent Destailleur 2021-01-19 16:19:46 +01:00
commit 755de9fff2

1
.gitignore vendored
View File

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