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
This commit is contained in:
jekkos
2016-03-07 21:33:26 +01:00
41 changed files with 698 additions and 2756 deletions

View File

@@ -155,4 +155,4 @@ a.rollover img
{
max-height: calc(100vh - 212px);
overflow-y: auto;
}
}