Files
ebean/ebean-test/testconfig
Roland Praml 6b0d04547e Merge remote-tracking branch 'upstream/master' into ebean-new
# Conflicts:
#	ebean-api/pom.xml
#	ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java
#	ebean-autotune/pom.xml
#	ebean-bom/pom.xml
#	ebean-core-type/pom.xml
#	ebean-core/pom.xml
#	ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
#	ebean-ddl-generator/pom.xml
#	ebean-externalmapping-api/pom.xml
#	ebean-externalmapping-xml/pom.xml
#	ebean-postgis/pom.xml
#	ebean-querybean/pom.xml
#	ebean-redis/pom.xml
#	ebean-test/pom.xml
#	ebean-test/src/test/resources/ebean.properties
#	ebean-test/testconfig/ebean-mariadb-10.3.properties
#	ebean-test/testconfig/ebean-mariadb.properties
#	ebean-test/testconfig/ebean-mysql.properties
#	ebean-test/testconfig/ebean-sqlserver17.properties
#	ebean/pom.xml
#	kotlin-querybean-generator/pom.xml
#	pom.xml
#	querybean-generator/pom.xml
2021-12-17 08:27:59 +01:00
..