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

7.3 KiB

Raw Blame History

View Raw