Merge branch 'develop' into feature/theming

This commit is contained in:
Graham Triggs 2016-10-05 22:38:23 +01:00
commit 4b610e64c9
49 changed files with 330 additions and 354 deletions

View file

@ -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>