From 6ffad6043ffeb24d0115de72090d153cd46e88de Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 21 Feb 2018 05:44:41 -0800
Subject: [PATCH 1/2] =?UTF-8?q?Fixed=20issue=20where=20bootstrap=20tables?=
 =?UTF-8?q?=20didn=E2=80=99t=20use=20a=20default=20page=20size?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/partials/bootstrap-table.blade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 9dd340b263..e5cc07b23b 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -56,6 +56,7 @@
             paginationPreText: "{{ trans('general.previous') }}",
             paginationNextText: "{{ trans('general.next') }}",
             pageList: ['10','20', '30','50','100','150','200', '500'],
+            pageSize: {{  (($snipeSettings->per_page!='') && ($snipeSettings->per_page > 0)) ? $snipeSettings->per_page : 20 }},
             paginationVAlign: 'both',
             formatLoadingMessage: function () {
                 return '<h4><i class="fa fa-spinner fa-spin" aria-hidden="true"></i> Loading... please wait.... </h4>';

From dbc16a6c9b021d6195e1abfe47ba0ff6fa78ca26 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 21 Feb 2018 05:47:12 -0800
Subject: [PATCH 2/2] Bumped hash

---
 config/version.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/version.php b/config/version.php
index fcd5cda3c9..581c40f962 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,10 +1,10 @@
 <?php
 return array (
   'app_version' => 'v4.1.12',
-  'full_app_version' => 'v4.1.12 - build 3365-g4ed2ef6',
-  'build_version' => '3365',
+  'full_app_version' => 'v4.1.12 - build 3371-g4e39895',
+  'build_version' => '3371',
   'prerelease_version' => '',
-  'hash_version' => 'g4ed2ef6',
-  'full_hash' => 'v4.1.11-6-g4ed2ef6',
+  'hash_version' => 'g4e39895',
+  'full_hash' => 'v4.1.12-6-g4e39895',
   'branch' => 'develop',
-);
\ No newline at end of file
+);