Skip to content
  • bornholdt's avatar
    Merge branch 'v0.4' · 088bfabe
    bornholdt authored
    # Conflicts:
    #	CHANGELOG.md
    #	chart/Chart.yaml
    #	docs/content/getting-started.md
    #	docs/content/plugins/groups.md
    #	docs/content/public-super-peers.md
    #	drasyl-all/pom.xml
    #	drasyl-cli/pom.xml
    #	drasyl-cli/src/main/java/org/drasyl/cli/command/WormholeCommand.java
    #	drasyl-cli/src/test/java/org/drasyl/cli/command/WormholeCommandTest.java
    #	drasyl-core/pom.xml
    #	drasyl-core/src/main/java/org/drasyl/util/NettyUtil.java
    #	drasyl-core/src/main/java/org/drasyl/util/logging/JdkLoggerFactory.java
    #	drasyl-core/src/main/resources/reference.conf
    #	drasyl-core/src/test/java/org/drasyl/util/NettyUtilTest.java
    #	drasyl-examples/pom.xml
    #	drasyl-integration-tests/pom.xml
    #	drasyl-integration-tests/src/test/java/org/drasyl/DrasylNodeIT.java
    #	drasyl-performance-tests/pom.xml
    #	drasyl-plugin-groups-client/pom.xml
    #	drasyl-plugin-groups-manager/pom.xml
    #	drasyl-plugin-groups-manager/src/main/resources/public/swagger.json
    #	pom.xml
    088bfabe
To find the state of this project's repository at the time of any of these versions, check out the tags.