From d1dc77b4b1599f7089e3184eb622f51035728da4 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 02 Jul 2013 16:46:52 -0400
Subject: [PATCH] Fixed committer verification with merge commits (issue-264)
---
src/main/java/com/gitblit/models/UserPreferences.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/gitblit/models/UserPreferences.java b/src/main/java/com/gitblit/models/UserPreferences.java
index 10f69cf..e6baa28 100644
--- a/src/main/java/com/gitblit/models/UserPreferences.java
+++ b/src/main/java/com/gitblit/models/UserPreferences.java
@@ -37,6 +37,8 @@
public final String username;
+ public String locale;
+
private final Map<String, UserRepositoryPreferences> repositoryPreferences = new TreeMap<String, UserRepositoryPreferences>();
public UserPreferences(String username) {
--
Gitblit v1.9.1