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_0058.sql |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/install/sql/incremental/upd_0058.sql b/install/sql/incremental/upd_0058.sql
index 087b499..906f6b1 100644
--- a/install/sql/incremental/upd_0058.sql
+++ b/install/sql/incremental/upd_0058.sql
@@ -1,3 +1,4 @@
 ALTER TABLE `client` ADD COLUMN `can_use_api` enum('n','y') NOT NULL DEFAULT 'n' AFTER `canceled`;
 
 ALTER TABLE `remote_session` ADD COLUMN `client_login` tinyint(1) unsigned NOT NULL default '0' AFTER `remote_functions`;
+

--
Gitblit v1.9.1