From 5b41f21c57274c4f2e58b78dcb8666d0b37dc6d2 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 27 Jun 2014 15:05:06 -0400
Subject: [PATCH] Merge branch 'ticket/115' into develop

---
 src/main/java/com/gitblit/wicket/pages/UserPage.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/gitblit/wicket/pages/UserPage.html b/src/main/java/com/gitblit/wicket/pages/UserPage.html
index 8dccfee..6bdd3ce 100644
--- a/src/main/java/com/gitblit/wicket/pages/UserPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/UserPage.html
@@ -64,8 +64,8 @@
 		<form wicket:id="prefsForm">
 			<div wicket:id="displayName"></div>
 			<div wicket:id="emailAddress"></div>
-			<div wicket:id="language"></div>
 			<div wicket:id="emailMeOnMyTicketChanges"></div>
+			<div wicket:id="language"></div>
 			<div wicket:id="transport"></div>
 			
 			<div class="form-actions"><input class="btn btn-appmenu" type="submit" value="Save" wicket:message="value:gb.save" wicket:id="save" /></div>

--
Gitblit v1.9.1