querydsl/querydsl-codegen/src
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
..
main/java/com/querydsl/codegen Merge branch 'master' into kotlin-codegen 2021-06-02 11:26:06 +02:00
test/java Merge branch 'master' into kotlin-codegen 2021-06-02 11:26:06 +02:00