From 2b2396521ca49d5f950977235b402fb9b3fd902a Mon Sep 17 00:00:00 2001
From: FrancescoUK <francesco.lodolo.uk@gmail.com>
Date: Sat, 21 Oct 2017 14:07:10 +0100
Subject: [PATCH] Update bootstrap-table js version to latest master

---
 application/views/partial/header.php | 4 ++--
 bower.json                           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/views/partial/header.php b/application/views/partial/header.php
index 1b6cdd49a..f8e3830b4 100644
--- a/application/views/partial/header.php
+++ b/application/views/partial/header.php
@@ -71,10 +71,10 @@
 		<![endif]-->
 		<!-- start mincss template tags -->
 		<link rel="stylesheet" type="text/css" href="dist/jquery-ui/jquery-ui.min.css"/>
-		<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=7f52cbc5d2"/>
+		<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=94a8b206d6"/>
 		<!-- end mincss template tags -->
 		<!-- start minjs template tags -->
-		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=b7fe20579d"></script>
+		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=47cade4b67"></script>
 		<!-- end minjs template tags -->
 	<?php endif; ?>
 
diff --git a/bower.json b/bower.json
index b5c3d37f9..5c33f52da 100644
--- a/bower.json
+++ b/bower.json
@@ -33,7 +33,7 @@
     "bootswatch": "^3.3.7",
     "smalot-bootstrap-datetimepicker": "~2.4.4",
     "bootstrap-select": "~1.12.4",
-    "bootstrap-table": "fde42200",
+    "bootstrap-table": "master",
     "bootstrap-daterangepicker": "~2.1.25",
     "tableExport.jquery.plugin": "1.5.1",
     "chartist": "~0.9.8",