From 9724f8f13bdc6bfb2f9649c54ad37fb45bea9870 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 06 Jan 2015 10:41:32 -0500
Subject: [PATCH] Merge remote-tracking branch 'ispc/master' into new-layout-3.1

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

diff --git a/remoting_client/API-docs/sites_database_add.html b/remoting_client/API-docs/sites_database_add.html
index 411f75d..acf53e7 100644
--- a/remoting_client/API-docs/sites_database_add.html
+++ b/remoting_client/API-docs/sites_database_add.html
@@ -20,6 +20,7 @@
 <p class="margin"> <span class="var">$session_id</span>, <span class="var">$client_id</span>, <span class="var">$params</span></p>
 <p class="headgrp">Parameters (in <span class="var">$params</span>): </p>
 <p class="margin"> server_id&nbsp;&nbsp;(<span class="paratype">int(11)</span>)</p>
+<p class="margin"> website_id&nbsp;&nbsp;(<span class="paratype">int(11)</span>)</p>
 <p class="margin"> type&nbsp;&nbsp;(<span class="paratype">varchar(16)</span>)</p>
 <p class="margin"> database_name&nbsp;&nbsp;(<span class="paratype">varchar(64)</span>)</p>
 <p class="margin"> database_user_id&nbsp;&nbsp;(<span class="paratype">int(11)</span>)</p>

--
Gitblit v1.9.1