Merge branch 'master' into talmdal_dev

Conflicts:
	modules/server_add/helpers/server_add_theme.php

1 files changed, 0 insertions, 33 deletions

diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index ef2f1510..84b8b090 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -513,39 +513,6 @@ td {
   background: #999;
 }
 
-/* Server Add */
-
-#g-server-add button {
-  margin-bottom: .5em;
-}
-
-#g-server-add-tree {
-  cursor: pointer;
-  padding-left: 4px;
-  width: 95%;
-}
-
-#g-server-add-tree li {
-  padding: 0;
-  float: none;
-}
-
-#g-server-add-tree span.selected {
-  background: #ddd;
-}
-
-#g-server-add-tree {
-  border: 1px solid #ccc;
-  height: 20em;
-  overflow: auto;
-  margin-bottom: .5em;
-  padding: .5em;
-}
-
-#g-server-add ul ul li {
-  padding-left: 1.2em;
-}
-
 /* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #g-edit-permissions-form {