From 410c92f5c71c93cd2b4b0a1d9ee4067c34b80c66 Mon Sep 17 00:00:00 2001
From: Eddy Young <jeyoung@priscimon.com>
Date: Fri, 22 May 2015 03:47:09 -0400
Subject: [PATCH] Merge branch 'develop' into ticket-57_develop

---
 src/main/java/com/gitblit/client/EditTeamDialog.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/gitblit/client/EditTeamDialog.java b/src/main/java/com/gitblit/client/EditTeamDialog.java
index 3c0b928..0b5b350 100644
--- a/src/main/java/com/gitblit/client/EditTeamDialog.java
+++ b/src/main/java/com/gitblit/client/EditTeamDialog.java
@@ -146,7 +146,6 @@
 		final Insets _insets = new Insets(5, 5, 5, 5);
 		repositoryPalette = new RegistrantPermissionsPanel(RegistrantType.REPOSITORY);
 		userPalette = new JPalette<String>();
-		userPalette.setEnabled(settings.supportsTeamMembershipChanges);
 
 		JPanel fieldsPanelTop = new JPanel(new BorderLayout());
 		fieldsPanelTop.add(fieldsPanel, BorderLayout.NORTH);

--
Gitblit v1.9.1