mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-19 23:02:24 +00:00
# Conflicts: # ebean-ddl-generator/pom.xml # ebean-test/src/test/java/io/ebean/xtest/core/DatesAndTimesTest.java # ebean-test/src/test/java/io/ebean/xtest/core/DatesAndTimesWithJsonMillisTest.java # ebean-test/src/test/java/io/ebean/xtest/core/DatesAndTimesWithJsonNanosTest.java