Merge branch 'release' into integration/master

Conflicts: zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
zanata · Mar 25, 2015 · 0ea0d3c · 0ea0d3c
2 parents a330cb1 + c8b3514
commit 0ea0d3c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
@@ -168,7 +168,7 @@
                     #{member.person.name}
                   </h3>
               <span class="list__item__meta">
-                #{member.person.account.username}<s:span rendered="#{identity.loggedIn}"> [#{member.person.email}] </s:span>
+                #{member.person.account.username}<s:span rendered="#{s:hasRole('admin')}"> [#{member.person.email}] </s:span>
               </span>
                 </div>
                 <div class="list__item__actions">