f43nd1r 6ca0fa156c Merge branch 'master' into kotlin-codegen ... # Conflicts: # querydsl-codegen/src/test/java/com/querydsl/codegen/EmbeddableSerializerTest.java # querydsl-codegen/src/test/java/com/querydsl/codegen/EntitySerializerTest.java # querydsl-codegen/src/test/java/com/querydsl/codegen/ProjectionSerializerTest.java		2021-06-02 11:26:06 +02:00
..
src	Merge branch 'master' into kotlin-codegen	2021-06-02 11:26:06 +02:00
pom.xml	Merge pull request #2751 from querydsl/dependabot/maven/slf4j.version-1.7.30	2021-06-02 09:53:13 +02:00