Commit e4d12bda authored by anthony's avatar anthony

Merge branch 'release-7.2.0' into 7.2.x

Conflicts:
	pom.xml
parents bf040449 3010e4ea
......@@ -14,7 +14,7 @@
<tychoExtrasVersion>0.22.0</tychoExtrasVersion>
<os-jvm-flags></os-jvm-flags>
<bundle.version>7.2.1-SNAPSHOT</bundle.version>
<ui.designer.version>1.2.11</ui.designer.version>
<ui.designer.version>1.2.12</ui.designer.version>
<engine.version>7.2.1-SNAPSHOT</engine.version>
<connector.version>6.1.1</connector.version>
<simulation.version>6.1.0</simulation.version>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment