mirror of
https://github.com/opensourcepos/opensourcepos.git
synced 2026-11-08 23:43:32 -05:00
# Conflicts: # app/Controllers/Items.php # app/Language/az/Config.php # app/Language/en/Customers.php # app/Language/es-MX/Config.php # app/Language/hr-HR/Config.php # app/Language/ru/Config.php # app/Language/th/Config.php # app/Views/configs/general_config.php # composer.lock # tests/Controllers/CustomersCsvImportTest.php # tests/Models/ItemBulkUpdateTest.php