dolibarr/htdocs/.gitignore
Laurent Destailleur 9666d5e3ae Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	htdocs/.gitignore
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
2014-09-18 10:17:43 +02:00

14 lines
137 B
Plaintext

/test.php
/custom*
/extensions*
/nltechno*
/ancot*
/teclib*
/bootstrap*
/google*
/multicompany*
/numberingpack*
/ovh*
/pos
/ultimatepdf*