Merge branch 'master' into db-purge
Conflicts: wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
This commit is contained in:
@@ -11,7 +11,7 @@
|
||||
<%--@elvariable id="mapXml" type="com.wisemapping.model.User"--%>
|
||||
<html>
|
||||
<head>
|
||||
<base href="${baseURL}/">
|
||||
<base href="${requestScope['site.baseurl']}/">
|
||||
<title><spring:message code="SITE.TITLE"/> - <c:out value="${mindmap.title}"/></title>
|
||||
<!--[if lt IE 9]>
|
||||
<meta http-equiv="X-UA-Compatible" content="chrome=1">
|
||||
|
Reference in New Issue
Block a user