From 80c78ba25cbf34bfd7b842d76fd2997dad9a95a0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 19 Jul 2017 17:18:25 +0200
Subject: [PATCH 1/3] remove empty lines at end of file

---
 views/bootstrap/class.CreateIndex.php        | 1 -
 views/bootstrap/class.SearchFulltext.php     | 1 -
 views/bootstrap/class.SubstituteUser.php     | 1 -
 views/bootstrap/class.WorkflowActionsMgr.php | 1 -
 views/bootstrap/class.WorkflowStatesMgr.php  | 1 -
 views/bootstrap/class.WorkflowSummary.php    | 1 -
 6 files changed, 6 deletions(-)

diff --git a/views/bootstrap/class.CreateIndex.php b/views/bootstrap/class.CreateIndex.php
index 77d6ca302..c4cf75fd6 100644
--- a/views/bootstrap/class.CreateIndex.php
+++ b/views/bootstrap/class.CreateIndex.php
@@ -52,4 +52,3 @@ class SeedDMS_View_CreateIndex extends SeedDMS_Bootstrap_Style {
 	} /* }}} */
 }
 ?>
-
diff --git a/views/bootstrap/class.SearchFulltext.php b/views/bootstrap/class.SearchFulltext.php
index 73abe148e..e80145e6e 100644
--- a/views/bootstrap/class.SearchFulltext.php
+++ b/views/bootstrap/class.SearchFulltext.php
@@ -128,4 +128,3 @@ class SeedDMS_View_SearchFulltext extends SeedDMS_Bootstrap_Style {
 	} /* }}} */
 }
 ?>
-
diff --git a/views/bootstrap/class.SubstituteUser.php b/views/bootstrap/class.SubstituteUser.php
index eeb0c5cd8..904aa6c36 100644
--- a/views/bootstrap/class.SubstituteUser.php
+++ b/views/bootstrap/class.SubstituteUser.php
@@ -101,4 +101,3 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
 	} /* }}} */
 }
 ?>
-
diff --git a/views/bootstrap/class.WorkflowActionsMgr.php b/views/bootstrap/class.WorkflowActionsMgr.php
index 54c1df736..28d9f2a07 100644
--- a/views/bootstrap/class.WorkflowActionsMgr.php
+++ b/views/bootstrap/class.WorkflowActionsMgr.php
@@ -204,4 +204,3 @@ $(document).ready( function() {
 	} /* }}} */
 }
 ?>
-
diff --git a/views/bootstrap/class.WorkflowStatesMgr.php b/views/bootstrap/class.WorkflowStatesMgr.php
index 078a71f6d..ffa894f10 100644
--- a/views/bootstrap/class.WorkflowStatesMgr.php
+++ b/views/bootstrap/class.WorkflowStatesMgr.php
@@ -215,4 +215,3 @@ $(document).ready(function() {
 	} /* }}} */
 }
 ?>
-
diff --git a/views/bootstrap/class.WorkflowSummary.php b/views/bootstrap/class.WorkflowSummary.php
index 7b128b314..1f9408d98 100644
--- a/views/bootstrap/class.WorkflowSummary.php
+++ b/views/bootstrap/class.WorkflowSummary.php
@@ -172,4 +172,3 @@ class SeedDMS_View_WorkflowSummary extends SeedDMS_Bootstrap_Style {
 	} /* }}} */
 }
 ?>
-

From 80ef51c0f31ee55c7a5c3b7ac791439c44d364b9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 19 Jul 2017 17:20:42 +0200
Subject: [PATCH 2/3] add entry for 4.3.35

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index fab68b8e8..dce668215 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
                      Changes in version 4.3.36
 --------------------------------------------------------------------------------
 - fix sql statement for creating temp. tables (sqlite)
+- remove empty lines at end of view/bootstrap/class.*.php files (Closes #329)
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.35

From 98b25c3f047b705a355a7f62d3c10346f14bd36b Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 19 Jul 2017 17:22:05 +0200
Subject: [PATCH 3/3] add changes for 5.0.13

---
 CHANGELOG | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 7d965bb68..03559129b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+                     Changes in version 5.0.13
+--------------------------------------------------------------------------------
+- merged changes from 4.3.36
+
 --------------------------------------------------------------------------------
                      Changes in version 5.0.12
 --------------------------------------------------------------------------------