From ba6ae959b8e21c714c69f66254e82837d45a3ed2 Mon Sep 17 00:00:00 2001 From: mschaefers <mschaefers@scoop-gmbh.de> Date: Mon, 03 Dec 2012 03:49:23 -0500 Subject: [PATCH] Merge branch 'master' of https://github.com/gitblit/gitblit into enhancedLdap --- src/com/gitblit/wicket/pages/FederationPage.html | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/gitblit/wicket/pages/FederationPage.html b/src/com/gitblit/wicket/pages/FederationPage.html index ab8a941..bb39d34 100644 --- a/src/com/gitblit/wicket/pages/FederationPage.html +++ b/src/com/gitblit/wicket/pages/FederationPage.html @@ -6,12 +6,12 @@ <body> <wicket:extend> - <div wicket:id="federationProposalsPanel">[federation proposals panel]</div> + <div wicket:id="federationTokensPanel">[federation tokens panel]</div> + + <div style="padding-top: 10px;" wicket:id="federationProposalsPanel">[federation proposals panel]</div> <div style="padding-top: 10px;" wicket:id="federationRegistrationsPanel">[federation registrations panel]</div> - <div wicket:id="federationTokensPanel">[federation tokens panel]</div> - </wicket:extend> </body> </html> \ No newline at end of file -- Gitblit v1.9.1