mirror of
https://github.com/opensourcepos/opensourcepos.git
synced 2026-01-29 11:41:06 -05:00
Conflicts: .travis.yml application/controllers/Login.php application/views/partial/header.php public/dist/opensourcepos.min.js
Conflicts: .travis.yml application/controllers/Login.php application/views/partial/header.php public/dist/opensourcepos.min.js