Merge branch 'master' into es17.05

2017-10-06 08:18:50 +02:00
parent 21adef6998 6f35ad7b16
commit 0a6a4281e7
18 changed files with 252 additions and 53 deletions
--- a/tests/dev/hello.ecf
+++ b/tests/dev/hello.ecf
@@ -26,7 +26,6 @@
 		</option>
 		<library name="default_standalone" location="..\..\library\server\wsf\default\standalone.ecf" readonly="false" use_application_options="true"/>
 		<cluster name="src" location="src\" recursive="true"/>
-		<override name="override" location="override\" recursive="true"/>
 	</target>
 	<target name="hello_cgi" extends="hello_dev">
 		<library name="default_cgi" location="..\..\library\server\wsf\default\cgi.ecf"/>