Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Bill Burke 2017-08-01 12:23:25 -04:00
commit 9f761a224d

View file

@ -43,8 +43,8 @@
</div>
<li>
</#if>
<#if referrer?has_content && referrer.url?has_content><li><a href="${referrer.url}" id="referrer">${msg("backTo",referrer.name)}</a></li></#if>
<li><a href="${url.logoutUrl}">${msg("doSignOut")}</a></li>
<#if referrer?has_content && referrer.url?has_content><li><a href="${referrer.url?html}" id="referrer">${msg("backTo",referrer.name?html)}</a></li></#if>
<li><a href="${url.logoutUrl?html}">${msg("doSignOut")}</a></li>
</ul>
</div>
</div>