Merge remote-tracking branch 'origin/master' into NewConnectors1

Conflicts:
	README.md
	pom.xml
This commit is contained in:
Admin
2017-02-16 15:22:06 -06:00
16 changed files with 49 additions and 16 deletions

View File

@@ -5,7 +5,7 @@
<groupId>com.bwssystems.HABridge</groupId>
<artifactId>ha-bridge</artifactId>
<version>4.1.2g</version>
<version>4.1.4</version>
<packaging>jar</packaging>
<name>HA Bridge</name>