Merge branch 'master' into converter

2017-03-26 23:50:08 +02:00
parent 72a0765ec6 286d6c3a4c
commit a5ab5c7d8e
30 changed files with 488 additions and 62 deletions
--- a/pom.xml
+++ b/pom.xml
@ -136,6 +136,7 @@
        <module>object-mother</module>
        <module>converter</module>
        <module>guarded-suspension</module>
+        <module>balking</module>
    </modules>

    <dependencyManagement>