Merge branch 'develop' into feature/searchIndexerTry

This commit is contained in:
j2blake 2015-01-16 16:54:50 -05:00
commit e724ecd50c

View file

@ -14,7 +14,7 @@
<#if statement.url?has_content>
<a href="${statement.url?url}" title="${i18n().link_text}">${linkText}</a>
<a href="${statement.url}" title="${i18n().link_text}">${linkText}</a>
<#else>
<a href="${profileUrl(statement.uri("link"))}" title="${i18n().link_name}">${statement.linkName}</a> (${i18n().no_url_provided})
</#if>