From 410c92f5c71c93cd2b4b0a1d9ee4067c34b80c66 Mon Sep 17 00:00:00 2001
From: Eddy Young <jeyoung@priscimon.com>
Date: Fri, 22 May 2015 03:47:09 -0400
Subject: [PATCH] Merge branch 'develop' into ticket-57_develop

---
 src/main/java/com/gitblit/wicket/pages/UserPage.html |    4 +++-
 1 files changed, 3 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 d71cb2b..6bdd3ce 100644
--- a/src/main/java/com/gitblit/wicket/pages/UserPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/UserPage.html
@@ -64,7 +64,9 @@
 		<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>
 		</form>	

--
Gitblit v1.9.1