From bd68aae78a5d696e4ccb9c0d267486c283a6d9d2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 18 Oct 2013 08:49:59 -0400
Subject: [PATCH] Resolved differences from svn merge to trunk and git master
---
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