Laurent Destailleur f931b92d36 Merge branch 'new-takepos-batch-decrement' of ... https://github.com/OPEN-DSI/dolibarr into develop # Conflicts: # htdocs/langs/en_US/errors.lang		2020-02-23 22:49:03 +01:00
..
index.html	Create index.html	2019-11-26 17:55:33 +01:00
orderprinters.php	Move Gnu.org to https	2019-09-23 21:55:30 +02:00
receipt.php	Travis fix	2020-02-20 15:45:42 +01:00
setup.php	Merge branch 'develop' into master	2020-02-21 18:20:10 +01:00
terminal.php	Merge branch 'new-takepos-batch-decrement' of	2020-02-23 22:49:03 +01:00