From 341ef7175af7c8f21d27262b58da8f5bc2c06ef0 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 08 Jul 2014 08:44:59 -0400
Subject: [PATCH] Merge branch 'master_fixes' into 'master'

---
 remoting_client/API-docs/sites_web_domain_add.html |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/remoting_client/API-docs/sites_web_domain_add.html b/remoting_client/API-docs/sites_web_domain_add.html
index de47806..02704b6 100644
--- a/remoting_client/API-docs/sites_web_domain_add.html
+++ b/remoting_client/API-docs/sites_web_domain_add.html
@@ -47,6 +47,7 @@
 <p class="margin"> ssl_organisation_unit&nbsp;&nbsp;(<span class="paratype">varchar(255)</span>)</p>
 <p class="margin"> ssl_country&nbsp;&nbsp;(<span class="paratype">varchar(255)</span>)</p>
 <p class="margin"> ssl_domain&nbsp;&nbsp;(<span class="paratype">varchar(255)</span>)</p>
+<p class="margin"> ssl_key&nbsp;&nbsp;(<span class="paratype">mediumtext</span>)</p>
 <p class="margin"> ssl_request&nbsp;&nbsp;(<span class="paratype">mediumtext</span>)</p>
 <p class="margin"> ssl_cert&nbsp;&nbsp;(<span class="paratype">mediumtext</span>)</p>
 <p class="margin"> ssl_bundle&nbsp;&nbsp;(<span class="paratype">mediumtext</span>)</p>

--
Gitblit v1.9.1