From f686264ad6d82cfaf4e401da2e259880f57bfade Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sat, 30 Jan 2016 07:44:29 -0500
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

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

diff --git a/install/sql/incremental/upd_0038.sql b/install/sql/incremental/upd_0038.sql
index f0d723c..eecc645 100644
--- a/install/sql/incremental/upd_0038.sql
+++ b/install/sql/incremental/upd_0038.sql
@@ -1,4 +1,4 @@
--- --------------------------------------------------------
+-- --------------------------------------------------------
 
 ALTER TABLE `web_domain` ADD `web_folder` VARCHAR( 100 ) DEFAULT NULL AFTER `document_root` ;
 

--
Gitblit v1.9.1