Merge branch 'v1' into es17.01

# Conflicts: # library/text/parser/uri_template/uri_template-safe.ecf # library/text/parser/uri_template/uri_template.ecf
2017-04-14 12:04:33 +02:00
parent 3590f8546f 273a55d93c
commit 94ba19920e
46 changed files with 12412 additions and 3635 deletions
--- a/library/text/parser/uri_template/uri_template.ecf
+++ b/library/text/parser/uri_template/uri_template.ecf
@@ -3,8 +3,8 @@
 	<target name="uri_template">
 		<root all_classes="true"/>
 		<file_rule>
-			<exclude>/.git$</exclude>
-			<exclude>/.svn$</exclude>
+			<exclude>/\.git$</exclude>
+			<exclude>/\.svn$</exclude>
 			<exclude>/EIFGENs$</exclude>
 		</file_rule>
 		<option warning="true">