Merge branch Sofia2 with lot of improvements

2017-01-17 21:40:59 +01:00
parent a7b8c07d1a ebdee0bb44
commit 97ddd1cd8b
62 changed files with 1608 additions and 502 deletions
@@ -5,7 +5,11 @@
        <relativePath>../</relativePath>
        <artifactId>moquette-parent</artifactId>
        <groupId>io.moquette</groupId>
+<<<<<<< HEAD
        <version>0.10-SNAPSHOT</version>
+=======
+        <version>0.9.1.sofia</version>
+>>>>>>> ebdee0bb4483b9c3b2332e8be1fe9835e332bc50
    </parent>

    <artifactId>moquette-osgi-test</artifactId>