Files
opensourcepos/application/controllers
jekkos 554f2b32db Merge branch 'feature/jquery_cleanup' into feature/bootstrapUI
Conflicts:
	application/views/items/manage.php
	application/views/partial/header.php
	dist/opensourcepos.min.css
	dist/opensourcepos.min.js
	templates/spacelab/views/partial/header.php
2016-03-07 21:33:26 +01:00
..
2016-03-07 07:56:41 +01:00
2016-01-07 19:06:35 +00:00