Skip to content

Commit 5494538

Browse files
kobylynskyikobylynskyi
committed
Merge branch 'master' into develop
# Conflicts: # build.gradle # plugins/gradle/example-client-kotlin/build.gradle # plugins/gradle/example-client/build.gradle # plugins/gradle/example-server/build.gradle # plugins/gradle/graphql-java-codegen-gradle-plugin/build.gradle # plugins/maven/example-client/pom.xml # plugins/maven/example-server/pom.xml # plugins/maven/graphql-java-codegen-maven-plugin/pom.xml # plugins/sbt/graphql-java-codegen-sbt-plugin/src/sbt-test/graphql-codegen-sbt-plugin/example-client-scala/project/plugins.sbt # plugins/sbt/graphql-java-codegen-sbt-plugin/src/sbt-test/graphql-codegen-sbt-plugin/example-client-scala/version.sbt # plugins/sbt/graphql-java-codegen-sbt-plugin/src/sbt-test/graphql-codegen-sbt-plugin/example-client/project/plugins.sbt # plugins/sbt/graphql-java-codegen-sbt-plugin/src/sbt-test/graphql-codegen-sbt-plugin/example-client/version.sbt # plugins/sbt/graphql-java-codegen-sbt-plugin/src/sbt-test/graphql-codegen-sbt-plugin/simple/project/plugins.sbt # plugins/sbt/graphql-java-codegen-sbt-plugin/src/sbt-test/graphql-codegen-sbt-plugin/simple/version.sbt # plugins/sbt/graphql-java-codegen-sbt-plugin/version.sbt
2 parents bb56d45 + 1e3360b commit 5494538

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)