Merge branch 'ticket/115' into develop

James Moger

2014-06-27 5b41f21c57274c4f2e58b78dcb8666d0b37dc6d2

 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);