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_0036.sql |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/install/sql/incremental/upd_0036.sql b/install/sql/incremental/upd_0036.sql
index db0d59d..0e5a301 100644
--- a/install/sql/incremental/upd_0036.sql
+++ b/install/sql/incremental/upd_0036.sql
@@ -1,5 +1,4 @@
--- --------------------------------------------------------
+-- --------------------------------------------------------
 
 ALTER TABLE  `web_domain` ADD  `perl` enum('n','y') NOT NULL default 'n' AFTER  `python`;
-
 

--
Gitblit v1.9.1