Merge branch 'master' into bootstrapUI

This commit is contained in:
FrancescoUK committed 2016-03-13 16:19:44 +00:00
commit f6be7cdf23
45 files changed
+477 -289

No files matched your search

+2 -2
View File
@@ -64,11 +64,11 @@
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=9ed20b1ee8"/>
<link rel="stylesheet" type="text/css" href="dist/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=3ded88f8ce"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=60674239d1"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos_bower.css"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=52d78ada05" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=10400d243b" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>