Merge branch 'master' into develop

James Moger

2014-05-07 0fbf8052cc0c6272baf64d8de2d07d2cdbf3a287

 src/main/java/com/gitblit/wicket/panels/TeamsPanel.java

@@ -39,7 +39,7 @@


      Fragment adminLinks = new Fragment("adminPanel", "adminLinks", this);

      adminLinks.add(new BookmarkablePageLink<Void>("newTeam", EditTeamPage.class));

      add(adminLinks.setVisible(showAdmin && app().users().supportsTeamMembershipChanges(null)));

      add(adminLinks.setVisible(showAdmin));



      final List<TeamModel> teams = app().users().getAllTeams();

      DataView<TeamModel> teamsView = new DataView<TeamModel>("teamRow",