From 6b35f8c32de5ebf7bedc429a6ff62709af9d5acd Mon Sep 17 00:00:00 2001
From: Rafael Cavazin <rafaelcavazin@gmail.com>
Date: Fri, 07 Dec 2012 08:24:16 -0500
Subject: [PATCH] Merge remote-tracking branch 'upstream/master' into translation_to_pt-br
---
src/com/gitblit/wicket/panels/FederationRegistrationsPanel.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/FederationRegistrationsPanel.java b/src/com/gitblit/wicket/panels/FederationRegistrationsPanel.java
index a2bfd8c..ff94717 100644
--- a/src/com/gitblit/wicket/panels/FederationRegistrationsPanel.java
+++ b/src/com/gitblit/wicket/panels/FederationRegistrationsPanel.java
@@ -66,9 +66,9 @@
item.add(WicketUtils.getRegistrationImage("typeIcon", entry, this));
- item.add(WicketUtils.createDateLabel("lastPull", entry.lastPull, getTimeZone()));
+ item.add(WicketUtils.createDateLabel("lastPull", entry.lastPull, getTimeZone(), getTimeUtils()));
item.add(WicketUtils
- .createTimestampLabel("nextPull", entry.nextPull, getTimeZone()));
+ .createTimestampLabel("nextPull", entry.nextPull, getTimeZone(), getTimeUtils()));
item.add(new Label("frequency", entry.frequency));
WicketUtils.setAlternatingBackground(item, counter);
counter++;
--
Gitblit v1.9.1