Merge branch 'develop' into feature/theming
This commit is contained in:
commit
4b610e64c9
49 changed files with 330 additions and 354 deletions
|
@ -0,0 +1,7 @@
|
|||
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
|
||||
|
||||
${jspBody!}
|
||||
|
||||
<#if jspScripts??>
|
||||
${headScripts.add(jspScripts)}
|
||||
</#if>
|
Loading…
Add table
Add a link
Reference in a new issue