f43nd1r f2710b1cf1 Merge branch 'master' into checkstyle ... # Conflicts: # pom.xml # querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/SimpleCompiler.java # querydsl-core/src/main/java/com/querydsl/core/group/GAvg.java # src/main/resources/querydsl_checks_base.xml		2021-06-02 11:08:54 +02:00
..
resources	Merge branch 'master' into checkstyle	2021-06-02 11:08:54 +02:00
assembly.xml	Fix paths	2015-03-23 23:06:08 +02:00