From 80c6a7f559ceb100b82921019bab3a0c5ed2ae2a Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Mon, 14 Mar 2016 10:59:09 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 install/sql/incremental/upd_0034.sql |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/install/sql/incremental/upd_0034.sql b/install/sql/incremental/upd_0034.sql
index 58b53c7..8ae098c 100644
--- a/install/sql/incremental/upd_0034.sql
+++ b/install/sql/incremental/upd_0034.sql
@@ -1,4 +1,4 @@
--- --------------------------------------------------------
+-- --------------------------------------------------------
 
 --
 -- Table structure for table `aps_instances`

--
Gitblit v1.9.1